diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 600eda1..acfa5e0 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -4,12 +4,13 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { addNoticeApi, getNoticeDetail, updateNoticeApi, uploadApi } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
+const title = ref('')
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
@@ -20,6 +21,7 @@
   noticeContent: '', // 发布内容
   minioFileName: '', // 上传文件名
   noticeTitle: '', // 标题
+  id: '',
 }) // 表单
 const rules = ref<FormRules>({
   noticeTitle: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
@@ -28,11 +30,36 @@
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // 弹窗初始化
-const initDialog = () => {
+const initDialog = (row: any) => {
   dialogVisible.value = true
-  ruleForm.noticePublisher = userInfo.$state.name
-  ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  title.value = row.title
+  if (row.title === '新建') {
+    ruleForm.noticePublisher = userInfo.$state.name
+    ruleForm.noticeCompany = userInfo.$state.deptName
+    ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    // 获取详情信息
+    getNoticeDetail({
+      noticeNo: row.noticeNo,
+      noticePublisher: row.noticePublisher,
+      noticeTitle: row.noticeTitle,
+      noticeEndTime: '',
+      noticeStartTime: '',
+    }).then((res) => {
+      if (res.code === 200 && res.data.rows.length) {
+        ruleForm.noticeNo = res.data.rows[0].noticeNo
+        ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+        ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+        ruleForm.noticeTime = res.data.rows[0].noticeTime
+        ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+        ruleForm.noticeContent = res.data.rows[0].noticeContent
+        ruleForm.minioFileName = res.data.rows[0].minioFileName
+        ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+        ruleForm.id = res.data.rows[0].id
+      }
+    })
+  }
 }
 defineExpose({ initDialog })
 // 重置
@@ -56,15 +83,17 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      addNoticeApi(ruleForm).then((res) => {
-        if (res.code === 200) {
-          close()
-          ElMessage.success('发布成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
+      title.value === '新建'
+        ? addNoticeApi
+        : updateNoticeApi(ruleForm).then((res) => {
+          if (res.code === 200) {
+            close()
+            ElMessage.success('操作成功')
+          }
+          else {
+            ElMessage.error(res.message)
+          }
+        })
     }
   })
 }
@@ -243,7 +272,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 600eda1..acfa5e0 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -4,12 +4,13 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { addNoticeApi, getNoticeDetail, updateNoticeApi, uploadApi } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
+const title = ref('')
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
@@ -20,6 +21,7 @@
   noticeContent: '', // 发布内容
   minioFileName: '', // 上传文件名
   noticeTitle: '', // 标题
+  id: '',
 }) // 表单
 const rules = ref<FormRules>({
   noticeTitle: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
@@ -28,11 +30,36 @@
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // 弹窗初始化
-const initDialog = () => {
+const initDialog = (row: any) => {
   dialogVisible.value = true
-  ruleForm.noticePublisher = userInfo.$state.name
-  ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  title.value = row.title
+  if (row.title === '新建') {
+    ruleForm.noticePublisher = userInfo.$state.name
+    ruleForm.noticeCompany = userInfo.$state.deptName
+    ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    // 获取详情信息
+    getNoticeDetail({
+      noticeNo: row.noticeNo,
+      noticePublisher: row.noticePublisher,
+      noticeTitle: row.noticeTitle,
+      noticeEndTime: '',
+      noticeStartTime: '',
+    }).then((res) => {
+      if (res.code === 200 && res.data.rows.length) {
+        ruleForm.noticeNo = res.data.rows[0].noticeNo
+        ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+        ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+        ruleForm.noticeTime = res.data.rows[0].noticeTime
+        ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+        ruleForm.noticeContent = res.data.rows[0].noticeContent
+        ruleForm.minioFileName = res.data.rows[0].minioFileName
+        ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+        ruleForm.id = res.data.rows[0].id
+      }
+    })
+  }
 }
 defineExpose({ initDialog })
 // 重置
@@ -56,15 +83,17 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      addNoticeApi(ruleForm).then((res) => {
-        if (res.code === 200) {
-          close()
-          ElMessage.success('发布成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
+      title.value === '新建'
+        ? addNoticeApi
+        : updateNoticeApi(ruleForm).then((res) => {
+          if (res.code === 200) {
+            close()
+            ElMessage.success('操作成功')
+          }
+          else {
+            ElMessage.error(res.message)
+          }
+        })
     }
   })
 }
@@ -243,7 +272,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index eaa60ae..3001057 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -1,24 +1,38 @@
 <!-- 通知公告 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading } from 'element-plus'
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
 // import tableHeader from './tableHeader.vue'
 import addNotice from './noteAdd.vue'
 import noticeDetail from './noticeDetail.vue'
 import type { noticeType } from './notice-interface'
-import { getNoticeeApi } from '@/api/system/notice'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
-  noticeTime: '', // 发布时间
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
   noticeTitle: '', // 标题
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns: Ref<TableColumn[]> = ref([])
@@ -55,9 +69,6 @@
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
-  if (!searchQuery.noticeTime) {
-    searchQuery.noticeTime = ''
-  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
@@ -78,8 +89,10 @@
 const resetSearchQuery = () => {
   searchQuery.noticeNo = ''
   searchQuery.noticePublisher = ''
-  searchQuery.noticeTime = ''
+  noticeTime.value = ''
   searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
 }
 // 查询
 const search = () => {
@@ -93,13 +106,45 @@
 const addDialog = ref() // 添加弹窗组件
 // 新建
 const add = () => {
-  addDialog.value.initDialog()
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
 }
 const detailDialog = ref() // 详情组件弹窗
 // 详情
 const detail = (row: noticeType) => {
   detailDialog.value.initDialog(row)
 }
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -166,9 +211,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -184,8 +238,9 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="searchQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -195,11 +250,17 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="100">
+          <el-table-column label="操作" align="center" width="140">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </template>

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 600eda1..acfa5e0 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -4,12 +4,13 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { addNoticeApi, getNoticeDetail, updateNoticeApi, uploadApi } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
+const title = ref('')
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
@@ -20,6 +21,7 @@
   noticeContent: '', // 发布内容
   minioFileName: '', // 上传文件名
   noticeTitle: '', // 标题
+  id: '',
 }) // 表单
 const rules = ref<FormRules>({
   noticeTitle: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
@@ -28,11 +30,36 @@
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // 弹窗初始化
-const initDialog = () => {
+const initDialog = (row: any) => {
   dialogVisible.value = true
-  ruleForm.noticePublisher = userInfo.$state.name
-  ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  title.value = row.title
+  if (row.title === '新建') {
+    ruleForm.noticePublisher = userInfo.$state.name
+    ruleForm.noticeCompany = userInfo.$state.deptName
+    ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    // 获取详情信息
+    getNoticeDetail({
+      noticeNo: row.noticeNo,
+      noticePublisher: row.noticePublisher,
+      noticeTitle: row.noticeTitle,
+      noticeEndTime: '',
+      noticeStartTime: '',
+    }).then((res) => {
+      if (res.code === 200 && res.data.rows.length) {
+        ruleForm.noticeNo = res.data.rows[0].noticeNo
+        ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+        ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+        ruleForm.noticeTime = res.data.rows[0].noticeTime
+        ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+        ruleForm.noticeContent = res.data.rows[0].noticeContent
+        ruleForm.minioFileName = res.data.rows[0].minioFileName
+        ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+        ruleForm.id = res.data.rows[0].id
+      }
+    })
+  }
 }
 defineExpose({ initDialog })
 // 重置
@@ -56,15 +83,17 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      addNoticeApi(ruleForm).then((res) => {
-        if (res.code === 200) {
-          close()
-          ElMessage.success('发布成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
+      title.value === '新建'
+        ? addNoticeApi
+        : updateNoticeApi(ruleForm).then((res) => {
+          if (res.code === 200) {
+            close()
+            ElMessage.success('操作成功')
+          }
+          else {
+            ElMessage.error(res.message)
+          }
+        })
     }
   })
 }
@@ -243,7 +272,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index eaa60ae..3001057 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -1,24 +1,38 @@
 <!-- 通知公告 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading } from 'element-plus'
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
 // import tableHeader from './tableHeader.vue'
 import addNotice from './noteAdd.vue'
 import noticeDetail from './noticeDetail.vue'
 import type { noticeType } from './notice-interface'
-import { getNoticeeApi } from '@/api/system/notice'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
-  noticeTime: '', // 发布时间
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
   noticeTitle: '', // 标题
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns: Ref<TableColumn[]> = ref([])
@@ -55,9 +69,6 @@
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
-  if (!searchQuery.noticeTime) {
-    searchQuery.noticeTime = ''
-  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
@@ -78,8 +89,10 @@
 const resetSearchQuery = () => {
   searchQuery.noticeNo = ''
   searchQuery.noticePublisher = ''
-  searchQuery.noticeTime = ''
+  noticeTime.value = ''
   searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
 }
 // 查询
 const search = () => {
@@ -93,13 +106,45 @@
 const addDialog = ref() // 添加弹窗组件
 // 新建
 const add = () => {
-  addDialog.value.initDialog()
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
 }
 const detailDialog = ref() // 详情组件弹窗
 // 详情
 const detail = (row: noticeType) => {
   detailDialog.value.initDialog(row)
 }
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -166,9 +211,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -184,8 +238,9 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="searchQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -195,11 +250,17 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="100">
+          <el-table-column label="操作" align="center" width="140">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts
index a1fc349..2e82ac9 100644
--- a/src/views/system/notice/notice-interface.ts
+++ b/src/views/system/notice/notice-interface.ts
@@ -7,6 +7,6 @@
   noticeNo: string // 	通知公告编号	string
   noticePublisher: string //	发布人	string
   noticeSketch: string //	内容简述	string
-  noticeTime: string //	发布时间	string
+  noticeTime?: string //	发布时间	string
   noticeTitle: string //	通知公告标题	string
 }

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 600eda1..acfa5e0 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -4,12 +4,13 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { addNoticeApi, getNoticeDetail, updateNoticeApi, uploadApi } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
+const title = ref('')
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
@@ -20,6 +21,7 @@
   noticeContent: '', // 发布内容
   minioFileName: '', // 上传文件名
   noticeTitle: '', // 标题
+  id: '',
 }) // 表单
 const rules = ref<FormRules>({
   noticeTitle: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
@@ -28,11 +30,36 @@
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // 弹窗初始化
-const initDialog = () => {
+const initDialog = (row: any) => {
   dialogVisible.value = true
-  ruleForm.noticePublisher = userInfo.$state.name
-  ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  title.value = row.title
+  if (row.title === '新建') {
+    ruleForm.noticePublisher = userInfo.$state.name
+    ruleForm.noticeCompany = userInfo.$state.deptName
+    ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    // 获取详情信息
+    getNoticeDetail({
+      noticeNo: row.noticeNo,
+      noticePublisher: row.noticePublisher,
+      noticeTitle: row.noticeTitle,
+      noticeEndTime: '',
+      noticeStartTime: '',
+    }).then((res) => {
+      if (res.code === 200 && res.data.rows.length) {
+        ruleForm.noticeNo = res.data.rows[0].noticeNo
+        ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+        ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+        ruleForm.noticeTime = res.data.rows[0].noticeTime
+        ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+        ruleForm.noticeContent = res.data.rows[0].noticeContent
+        ruleForm.minioFileName = res.data.rows[0].minioFileName
+        ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+        ruleForm.id = res.data.rows[0].id
+      }
+    })
+  }
 }
 defineExpose({ initDialog })
 // 重置
@@ -56,15 +83,17 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      addNoticeApi(ruleForm).then((res) => {
-        if (res.code === 200) {
-          close()
-          ElMessage.success('发布成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
+      title.value === '新建'
+        ? addNoticeApi
+        : updateNoticeApi(ruleForm).then((res) => {
+          if (res.code === 200) {
+            close()
+            ElMessage.success('操作成功')
+          }
+          else {
+            ElMessage.error(res.message)
+          }
+        })
     }
   })
 }
@@ -243,7 +272,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index eaa60ae..3001057 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -1,24 +1,38 @@
 <!-- 通知公告 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading } from 'element-plus'
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
 // import tableHeader from './tableHeader.vue'
 import addNotice from './noteAdd.vue'
 import noticeDetail from './noticeDetail.vue'
 import type { noticeType } from './notice-interface'
-import { getNoticeeApi } from '@/api/system/notice'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
-  noticeTime: '', // 发布时间
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
   noticeTitle: '', // 标题
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns: Ref<TableColumn[]> = ref([])
@@ -55,9 +69,6 @@
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
-  if (!searchQuery.noticeTime) {
-    searchQuery.noticeTime = ''
-  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
@@ -78,8 +89,10 @@
 const resetSearchQuery = () => {
   searchQuery.noticeNo = ''
   searchQuery.noticePublisher = ''
-  searchQuery.noticeTime = ''
+  noticeTime.value = ''
   searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
 }
 // 查询
 const search = () => {
@@ -93,13 +106,45 @@
 const addDialog = ref() // 添加弹窗组件
 // 新建
 const add = () => {
-  addDialog.value.initDialog()
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
 }
 const detailDialog = ref() // 详情组件弹窗
 // 详情
 const detail = (row: noticeType) => {
   detailDialog.value.initDialog(row)
 }
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -166,9 +211,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -184,8 +238,9 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="searchQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -195,11 +250,17 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="100">
+          <el-table-column label="操作" align="center" width="140">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts
index a1fc349..2e82ac9 100644
--- a/src/views/system/notice/notice-interface.ts
+++ b/src/views/system/notice/notice-interface.ts
@@ -7,6 +7,6 @@
   noticeNo: string // 	通知公告编号	string
   noticePublisher: string //	发布人	string
   noticeSketch: string //	内容简述	string
-  noticeTime: string //	发布时间	string
+  noticeTime?: string //	发布时间	string
   noticeTitle: string //	通知公告标题	string
 }
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index da36bd8..18435ec 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -22,8 +22,10 @@
   getNoticeDetail({
     noticeNo: row.noticeNo,
     noticePublisher: row.noticePublisher,
-    noticeTime: row.noticeTime,
+    // noticeTime: row.noticeTime,
     noticeTitle: row.noticeTitle,
+    noticeEndTime: '',
+    noticeStartTime: '',
   }).then((res) => {
     if (res.code === 200 && res.data.rows.length) {
       ruleForm.noticeNo = res.data.rows[0].noticeNo

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 600eda1..acfa5e0 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -4,12 +4,13 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { addNoticeApi, getNoticeDetail, updateNoticeApi, uploadApi } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
+const title = ref('')
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
@@ -20,6 +21,7 @@
   noticeContent: '', // 发布内容
   minioFileName: '', // 上传文件名
   noticeTitle: '', // 标题
+  id: '',
 }) // 表单
 const rules = ref<FormRules>({
   noticeTitle: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
@@ -28,11 +30,36 @@
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // 弹窗初始化
-const initDialog = () => {
+const initDialog = (row: any) => {
   dialogVisible.value = true
-  ruleForm.noticePublisher = userInfo.$state.name
-  ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  title.value = row.title
+  if (row.title === '新建') {
+    ruleForm.noticePublisher = userInfo.$state.name
+    ruleForm.noticeCompany = userInfo.$state.deptName
+    ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    // 获取详情信息
+    getNoticeDetail({
+      noticeNo: row.noticeNo,
+      noticePublisher: row.noticePublisher,
+      noticeTitle: row.noticeTitle,
+      noticeEndTime: '',
+      noticeStartTime: '',
+    }).then((res) => {
+      if (res.code === 200 && res.data.rows.length) {
+        ruleForm.noticeNo = res.data.rows[0].noticeNo
+        ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+        ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+        ruleForm.noticeTime = res.data.rows[0].noticeTime
+        ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+        ruleForm.noticeContent = res.data.rows[0].noticeContent
+        ruleForm.minioFileName = res.data.rows[0].minioFileName
+        ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+        ruleForm.id = res.data.rows[0].id
+      }
+    })
+  }
 }
 defineExpose({ initDialog })
 // 重置
@@ -56,15 +83,17 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      addNoticeApi(ruleForm).then((res) => {
-        if (res.code === 200) {
-          close()
-          ElMessage.success('发布成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
+      title.value === '新建'
+        ? addNoticeApi
+        : updateNoticeApi(ruleForm).then((res) => {
+          if (res.code === 200) {
+            close()
+            ElMessage.success('操作成功')
+          }
+          else {
+            ElMessage.error(res.message)
+          }
+        })
     }
   })
 }
@@ -243,7 +272,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index eaa60ae..3001057 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -1,24 +1,38 @@
 <!-- 通知公告 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading } from 'element-plus'
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
 // import tableHeader from './tableHeader.vue'
 import addNotice from './noteAdd.vue'
 import noticeDetail from './noticeDetail.vue'
 import type { noticeType } from './notice-interface'
-import { getNoticeeApi } from '@/api/system/notice'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
-  noticeTime: '', // 发布时间
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
   noticeTitle: '', // 标题
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns: Ref<TableColumn[]> = ref([])
@@ -55,9 +69,6 @@
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
-  if (!searchQuery.noticeTime) {
-    searchQuery.noticeTime = ''
-  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
@@ -78,8 +89,10 @@
 const resetSearchQuery = () => {
   searchQuery.noticeNo = ''
   searchQuery.noticePublisher = ''
-  searchQuery.noticeTime = ''
+  noticeTime.value = ''
   searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
 }
 // 查询
 const search = () => {
@@ -93,13 +106,45 @@
 const addDialog = ref() // 添加弹窗组件
 // 新建
 const add = () => {
-  addDialog.value.initDialog()
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
 }
 const detailDialog = ref() // 详情组件弹窗
 // 详情
 const detail = (row: noticeType) => {
   detailDialog.value.initDialog(row)
 }
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -166,9 +211,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -184,8 +238,9 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="searchQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -195,11 +250,17 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="100">
+          <el-table-column label="操作" align="center" width="140">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts
index a1fc349..2e82ac9 100644
--- a/src/views/system/notice/notice-interface.ts
+++ b/src/views/system/notice/notice-interface.ts
@@ -7,6 +7,6 @@
   noticeNo: string // 	通知公告编号	string
   noticePublisher: string //	发布人	string
   noticeSketch: string //	内容简述	string
-  noticeTime: string //	发布时间	string
+  noticeTime?: string //	发布时间	string
   noticeTitle: string //	通知公告标题	string
 }
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index da36bd8..18435ec 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -22,8 +22,10 @@
   getNoticeDetail({
     noticeNo: row.noticeNo,
     noticePublisher: row.noticePublisher,
-    noticeTime: row.noticeTime,
+    // noticeTime: row.noticeTime,
     noticeTitle: row.noticeTitle,
+    noticeEndTime: '',
+    noticeStartTime: '',
   }).then((res) => {
     if (res.code === 200 && res.data.rows.length) {
       ruleForm.noticeNo = res.data.rows[0].noticeNo
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 7cd607b..05389a0 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -10,15 +10,28 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
   limit: 20,
   offset: 1,
   signType: '',
+  ids: [],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +51,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -107,7 +117,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.signDirector = ''
   searchQuery.signName = ''
   searchQuery.signNo = ''
@@ -121,6 +133,12 @@
     title: '新增',
   })
 }
+// 表格被选中的行
+const selectList = ref<signType[]>([])
+// 表格多选
+const multiSelect = (row: signType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -128,10 +146,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, '签名管理')
     loading.close()
+    searchQuery.ids = []
   })
     .catch((_) => {
       loading.close()
@@ -181,9 +207,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -202,7 +237,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 600eda1..acfa5e0 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -4,12 +4,13 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { addNoticeApi, getNoticeDetail, updateNoticeApi, uploadApi } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
+const title = ref('')
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
@@ -20,6 +21,7 @@
   noticeContent: '', // 发布内容
   minioFileName: '', // 上传文件名
   noticeTitle: '', // 标题
+  id: '',
 }) // 表单
 const rules = ref<FormRules>({
   noticeTitle: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
@@ -28,11 +30,36 @@
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // 弹窗初始化
-const initDialog = () => {
+const initDialog = (row: any) => {
   dialogVisible.value = true
-  ruleForm.noticePublisher = userInfo.$state.name
-  ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  title.value = row.title
+  if (row.title === '新建') {
+    ruleForm.noticePublisher = userInfo.$state.name
+    ruleForm.noticeCompany = userInfo.$state.deptName
+    ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    // 获取详情信息
+    getNoticeDetail({
+      noticeNo: row.noticeNo,
+      noticePublisher: row.noticePublisher,
+      noticeTitle: row.noticeTitle,
+      noticeEndTime: '',
+      noticeStartTime: '',
+    }).then((res) => {
+      if (res.code === 200 && res.data.rows.length) {
+        ruleForm.noticeNo = res.data.rows[0].noticeNo
+        ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+        ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+        ruleForm.noticeTime = res.data.rows[0].noticeTime
+        ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+        ruleForm.noticeContent = res.data.rows[0].noticeContent
+        ruleForm.minioFileName = res.data.rows[0].minioFileName
+        ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+        ruleForm.id = res.data.rows[0].id
+      }
+    })
+  }
 }
 defineExpose({ initDialog })
 // 重置
@@ -56,15 +83,17 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      addNoticeApi(ruleForm).then((res) => {
-        if (res.code === 200) {
-          close()
-          ElMessage.success('发布成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
+      title.value === '新建'
+        ? addNoticeApi
+        : updateNoticeApi(ruleForm).then((res) => {
+          if (res.code === 200) {
+            close()
+            ElMessage.success('操作成功')
+          }
+          else {
+            ElMessage.error(res.message)
+          }
+        })
     }
   })
 }
@@ -243,7 +272,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index eaa60ae..3001057 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -1,24 +1,38 @@
 <!-- 通知公告 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading } from 'element-plus'
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
 // import tableHeader from './tableHeader.vue'
 import addNotice from './noteAdd.vue'
 import noticeDetail from './noticeDetail.vue'
 import type { noticeType } from './notice-interface'
-import { getNoticeeApi } from '@/api/system/notice'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
-  noticeTime: '', // 发布时间
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
   noticeTitle: '', // 标题
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns: Ref<TableColumn[]> = ref([])
@@ -55,9 +69,6 @@
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
-  if (!searchQuery.noticeTime) {
-    searchQuery.noticeTime = ''
-  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
@@ -78,8 +89,10 @@
 const resetSearchQuery = () => {
   searchQuery.noticeNo = ''
   searchQuery.noticePublisher = ''
-  searchQuery.noticeTime = ''
+  noticeTime.value = ''
   searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
 }
 // 查询
 const search = () => {
@@ -93,13 +106,45 @@
 const addDialog = ref() // 添加弹窗组件
 // 新建
 const add = () => {
-  addDialog.value.initDialog()
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
 }
 const detailDialog = ref() // 详情组件弹窗
 // 详情
 const detail = (row: noticeType) => {
   detailDialog.value.initDialog(row)
 }
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -166,9 +211,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -184,8 +238,9 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="searchQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -195,11 +250,17 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="100">
+          <el-table-column label="操作" align="center" width="140">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts
index a1fc349..2e82ac9 100644
--- a/src/views/system/notice/notice-interface.ts
+++ b/src/views/system/notice/notice-interface.ts
@@ -7,6 +7,6 @@
   noticeNo: string // 	通知公告编号	string
   noticePublisher: string //	发布人	string
   noticeSketch: string //	内容简述	string
-  noticeTime: string //	发布时间	string
+  noticeTime?: string //	发布时间	string
   noticeTitle: string //	通知公告标题	string
 }
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index da36bd8..18435ec 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -22,8 +22,10 @@
   getNoticeDetail({
     noticeNo: row.noticeNo,
     noticePublisher: row.noticePublisher,
-    noticeTime: row.noticeTime,
+    // noticeTime: row.noticeTime,
     noticeTitle: row.noticeTitle,
+    noticeEndTime: '',
+    noticeStartTime: '',
   }).then((res) => {
     if (res.code === 200 && res.data.rows.length) {
       ruleForm.noticeNo = res.data.rows[0].noticeNo
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 7cd607b..05389a0 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -10,15 +10,28 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
   limit: 20,
   offset: 1,
   signType: '',
+  ids: [],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +51,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -107,7 +117,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.signDirector = ''
   searchQuery.signName = ''
   searchQuery.signNo = ''
@@ -121,6 +133,12 @@
     title: '新增',
   })
 }
+// 表格被选中的行
+const selectList = ref<signType[]>([])
+// 表格多选
+const multiSelect = (row: signType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -128,10 +146,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, '签名管理')
     loading.close()
+    searchQuery.ids = []
   })
     .catch((_) => {
       loading.close()
@@ -181,9 +207,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -202,7 +237,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index cb77376..314ad46 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -10,15 +10,29 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
+  // createTime: '', // 创建时间
   limit: 20,
   offset: 1,
   templateType: '',
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +52,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -106,7 +117,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
@@ -124,6 +137,12 @@
 const exportSele = (row: templateType) => {
   // 下载模板
 }
+// 表格被选中的行
+const selectList = ref<templateType[]>([])
+// 表格多选
+const multiSelect = (row: templateType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -131,9 +150,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   templateExport(searchQuery).then((res) => {
     exportFile(res.data, '证书报告模板')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -182,9 +207,18 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="创建时间"
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
         />
+        <!-- <el-date-picker
+          v-model="createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="创建时间"
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -203,7 +237,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 600eda1..acfa5e0 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -4,12 +4,13 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { addNoticeApi, getNoticeDetail, updateNoticeApi, uploadApi } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
+const title = ref('')
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
@@ -20,6 +21,7 @@
   noticeContent: '', // 发布内容
   minioFileName: '', // 上传文件名
   noticeTitle: '', // 标题
+  id: '',
 }) // 表单
 const rules = ref<FormRules>({
   noticeTitle: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
@@ -28,11 +30,36 @@
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // 弹窗初始化
-const initDialog = () => {
+const initDialog = (row: any) => {
   dialogVisible.value = true
-  ruleForm.noticePublisher = userInfo.$state.name
-  ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  title.value = row.title
+  if (row.title === '新建') {
+    ruleForm.noticePublisher = userInfo.$state.name
+    ruleForm.noticeCompany = userInfo.$state.deptName
+    ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    // 获取详情信息
+    getNoticeDetail({
+      noticeNo: row.noticeNo,
+      noticePublisher: row.noticePublisher,
+      noticeTitle: row.noticeTitle,
+      noticeEndTime: '',
+      noticeStartTime: '',
+    }).then((res) => {
+      if (res.code === 200 && res.data.rows.length) {
+        ruleForm.noticeNo = res.data.rows[0].noticeNo
+        ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+        ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+        ruleForm.noticeTime = res.data.rows[0].noticeTime
+        ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+        ruleForm.noticeContent = res.data.rows[0].noticeContent
+        ruleForm.minioFileName = res.data.rows[0].minioFileName
+        ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+        ruleForm.id = res.data.rows[0].id
+      }
+    })
+  }
 }
 defineExpose({ initDialog })
 // 重置
@@ -56,15 +83,17 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      addNoticeApi(ruleForm).then((res) => {
-        if (res.code === 200) {
-          close()
-          ElMessage.success('发布成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
+      title.value === '新建'
+        ? addNoticeApi
+        : updateNoticeApi(ruleForm).then((res) => {
+          if (res.code === 200) {
+            close()
+            ElMessage.success('操作成功')
+          }
+          else {
+            ElMessage.error(res.message)
+          }
+        })
     }
   })
 }
@@ -243,7 +272,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index eaa60ae..3001057 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -1,24 +1,38 @@
 <!-- 通知公告 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading } from 'element-plus'
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
 // import tableHeader from './tableHeader.vue'
 import addNotice from './noteAdd.vue'
 import noticeDetail from './noticeDetail.vue'
 import type { noticeType } from './notice-interface'
-import { getNoticeeApi } from '@/api/system/notice'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
-  noticeTime: '', // 发布时间
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
   noticeTitle: '', // 标题
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns: Ref<TableColumn[]> = ref([])
@@ -55,9 +69,6 @@
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
-  if (!searchQuery.noticeTime) {
-    searchQuery.noticeTime = ''
-  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
@@ -78,8 +89,10 @@
 const resetSearchQuery = () => {
   searchQuery.noticeNo = ''
   searchQuery.noticePublisher = ''
-  searchQuery.noticeTime = ''
+  noticeTime.value = ''
   searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
 }
 // 查询
 const search = () => {
@@ -93,13 +106,45 @@
 const addDialog = ref() // 添加弹窗组件
 // 新建
 const add = () => {
-  addDialog.value.initDialog()
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
 }
 const detailDialog = ref() // 详情组件弹窗
 // 详情
 const detail = (row: noticeType) => {
   detailDialog.value.initDialog(row)
 }
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -166,9 +211,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -184,8 +238,9 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="searchQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -195,11 +250,17 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="100">
+          <el-table-column label="操作" align="center" width="140">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts
index a1fc349..2e82ac9 100644
--- a/src/views/system/notice/notice-interface.ts
+++ b/src/views/system/notice/notice-interface.ts
@@ -7,6 +7,6 @@
   noticeNo: string // 	通知公告编号	string
   noticePublisher: string //	发布人	string
   noticeSketch: string //	内容简述	string
-  noticeTime: string //	发布时间	string
+  noticeTime?: string //	发布时间	string
   noticeTitle: string //	通知公告标题	string
 }
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index da36bd8..18435ec 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -22,8 +22,10 @@
   getNoticeDetail({
     noticeNo: row.noticeNo,
     noticePublisher: row.noticePublisher,
-    noticeTime: row.noticeTime,
+    // noticeTime: row.noticeTime,
     noticeTitle: row.noticeTitle,
+    noticeEndTime: '',
+    noticeStartTime: '',
   }).then((res) => {
     if (res.code === 200 && res.data.rows.length) {
       ruleForm.noticeNo = res.data.rows[0].noticeNo
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 7cd607b..05389a0 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -10,15 +10,28 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
   limit: 20,
   offset: 1,
   signType: '',
+  ids: [],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +51,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -107,7 +117,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.signDirector = ''
   searchQuery.signName = ''
   searchQuery.signNo = ''
@@ -121,6 +133,12 @@
     title: '新增',
   })
 }
+// 表格被选中的行
+const selectList = ref<signType[]>([])
+// 表格多选
+const multiSelect = (row: signType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -128,10 +146,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, '签名管理')
     loading.close()
+    searchQuery.ids = []
   })
     .catch((_) => {
       loading.close()
@@ -181,9 +207,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -202,7 +237,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index cb77376..314ad46 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -10,15 +10,29 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
+  // createTime: '', // 创建时间
   limit: 20,
   offset: 1,
   templateType: '',
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +52,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -106,7 +117,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
@@ -124,6 +137,12 @@
 const exportSele = (row: templateType) => {
   // 下载模板
 }
+// 表格被选中的行
+const selectList = ref<templateType[]>([])
+// 表格多选
+const multiSelect = (row: templateType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -131,9 +150,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   templateExport(searchQuery).then((res) => {
     exportFile(res.data, '证书报告模板')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -182,9 +207,18 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="创建时间"
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
         />
+        <!-- <el-date-picker
+          v-model="createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="创建时间"
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -203,7 +237,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 4a49f38..f5ce74f 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -9,15 +9,28 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
   limit: 20,
   offset: 1,
   templateType: '',
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -37,9 +50,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -105,7 +115,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
@@ -123,6 +135,12 @@
 const exportSele = (row: templateType) => {
 //  下载模板
 }
+// 表格被选中的行
+const selectList = ref<templateType[]>([])
+// 表格多选
+const multiSelect = (row: templateType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -130,9 +148,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   templateExport(searchQuery).then((res) => {
     exportFile(res.data, '原始记录模板')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -181,9 +208,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -202,7 +238,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 600eda1..acfa5e0 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -4,12 +4,13 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { addNoticeApi, getNoticeDetail, updateNoticeApi, uploadApi } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
+const title = ref('')
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
@@ -20,6 +21,7 @@
   noticeContent: '', // 发布内容
   minioFileName: '', // 上传文件名
   noticeTitle: '', // 标题
+  id: '',
 }) // 表单
 const rules = ref<FormRules>({
   noticeTitle: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
@@ -28,11 +30,36 @@
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // 弹窗初始化
-const initDialog = () => {
+const initDialog = (row: any) => {
   dialogVisible.value = true
-  ruleForm.noticePublisher = userInfo.$state.name
-  ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  title.value = row.title
+  if (row.title === '新建') {
+    ruleForm.noticePublisher = userInfo.$state.name
+    ruleForm.noticeCompany = userInfo.$state.deptName
+    ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    // 获取详情信息
+    getNoticeDetail({
+      noticeNo: row.noticeNo,
+      noticePublisher: row.noticePublisher,
+      noticeTitle: row.noticeTitle,
+      noticeEndTime: '',
+      noticeStartTime: '',
+    }).then((res) => {
+      if (res.code === 200 && res.data.rows.length) {
+        ruleForm.noticeNo = res.data.rows[0].noticeNo
+        ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+        ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+        ruleForm.noticeTime = res.data.rows[0].noticeTime
+        ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+        ruleForm.noticeContent = res.data.rows[0].noticeContent
+        ruleForm.minioFileName = res.data.rows[0].minioFileName
+        ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+        ruleForm.id = res.data.rows[0].id
+      }
+    })
+  }
 }
 defineExpose({ initDialog })
 // 重置
@@ -56,15 +83,17 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      addNoticeApi(ruleForm).then((res) => {
-        if (res.code === 200) {
-          close()
-          ElMessage.success('发布成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
+      title.value === '新建'
+        ? addNoticeApi
+        : updateNoticeApi(ruleForm).then((res) => {
+          if (res.code === 200) {
+            close()
+            ElMessage.success('操作成功')
+          }
+          else {
+            ElMessage.error(res.message)
+          }
+        })
     }
   })
 }
@@ -243,7 +272,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index eaa60ae..3001057 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -1,24 +1,38 @@
 <!-- 通知公告 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading } from 'element-plus'
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
 // import tableHeader from './tableHeader.vue'
 import addNotice from './noteAdd.vue'
 import noticeDetail from './noticeDetail.vue'
 import type { noticeType } from './notice-interface'
-import { getNoticeeApi } from '@/api/system/notice'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
-  noticeTime: '', // 发布时间
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
   noticeTitle: '', // 标题
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns: Ref<TableColumn[]> = ref([])
@@ -55,9 +69,6 @@
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
-  if (!searchQuery.noticeTime) {
-    searchQuery.noticeTime = ''
-  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
@@ -78,8 +89,10 @@
 const resetSearchQuery = () => {
   searchQuery.noticeNo = ''
   searchQuery.noticePublisher = ''
-  searchQuery.noticeTime = ''
+  noticeTime.value = ''
   searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
 }
 // 查询
 const search = () => {
@@ -93,13 +106,45 @@
 const addDialog = ref() // 添加弹窗组件
 // 新建
 const add = () => {
-  addDialog.value.initDialog()
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
 }
 const detailDialog = ref() // 详情组件弹窗
 // 详情
 const detail = (row: noticeType) => {
   detailDialog.value.initDialog(row)
 }
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -166,9 +211,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -184,8 +238,9 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="searchQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -195,11 +250,17 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="100">
+          <el-table-column label="操作" align="center" width="140">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts
index a1fc349..2e82ac9 100644
--- a/src/views/system/notice/notice-interface.ts
+++ b/src/views/system/notice/notice-interface.ts
@@ -7,6 +7,6 @@
   noticeNo: string // 	通知公告编号	string
   noticePublisher: string //	发布人	string
   noticeSketch: string //	内容简述	string
-  noticeTime: string //	发布时间	string
+  noticeTime?: string //	发布时间	string
   noticeTitle: string //	通知公告标题	string
 }
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index da36bd8..18435ec 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -22,8 +22,10 @@
   getNoticeDetail({
     noticeNo: row.noticeNo,
     noticePublisher: row.noticePublisher,
-    noticeTime: row.noticeTime,
+    // noticeTime: row.noticeTime,
     noticeTitle: row.noticeTitle,
+    noticeEndTime: '',
+    noticeStartTime: '',
   }).then((res) => {
     if (res.code === 200 && res.data.rows.length) {
       ruleForm.noticeNo = res.data.rows[0].noticeNo
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 7cd607b..05389a0 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -10,15 +10,28 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
   limit: 20,
   offset: 1,
   signType: '',
+  ids: [],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +51,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -107,7 +117,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.signDirector = ''
   searchQuery.signName = ''
   searchQuery.signNo = ''
@@ -121,6 +133,12 @@
     title: '新增',
   })
 }
+// 表格被选中的行
+const selectList = ref<signType[]>([])
+// 表格多选
+const multiSelect = (row: signType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -128,10 +146,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, '签名管理')
     loading.close()
+    searchQuery.ids = []
   })
     .catch((_) => {
       loading.close()
@@ -181,9 +207,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -202,7 +237,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index cb77376..314ad46 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -10,15 +10,29 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
+  // createTime: '', // 创建时间
   limit: 20,
   offset: 1,
   templateType: '',
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +52,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -106,7 +117,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
@@ -124,6 +137,12 @@
 const exportSele = (row: templateType) => {
   // 下载模板
 }
+// 表格被选中的行
+const selectList = ref<templateType[]>([])
+// 表格多选
+const multiSelect = (row: templateType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -131,9 +150,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   templateExport(searchQuery).then((res) => {
     exportFile(res.data, '证书报告模板')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -182,9 +207,18 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="创建时间"
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
         />
+        <!-- <el-date-picker
+          v-model="createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="创建时间"
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -203,7 +237,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 4a49f38..f5ce74f 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -9,15 +9,28 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
   limit: 20,
   offset: 1,
   templateType: '',
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -37,9 +50,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -105,7 +115,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
@@ -123,6 +135,12 @@
 const exportSele = (row: templateType) => {
 //  下载模板
 }
+// 表格被选中的行
+const selectList = ref<templateType[]>([])
+// 表格多选
+const multiSelect = (row: templateType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -130,9 +148,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   templateExport(searchQuery).then((res) => {
     exportFile(res.data, '原始记录模板')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -181,9 +208,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -202,7 +238,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 7e5f9f7..9be30d2 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -10,15 +10,28 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
   limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +51,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -106,7 +116,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.signDirector = ''
   searchQuery.signName = ''
   searchQuery.signNo = ''
@@ -120,6 +132,12 @@
     title: '新增',
   })
 }
+// 表格被选中的行
+const selectList = ref<signType[]>([])
+// 表格多选
+const multiSelect = (row: signType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -127,9 +145,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, '签章管理')
     loading.close()
+    searchQuery.ids = []
   })
     .catch((_) => {
       loading.close()
@@ -179,9 +206,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -200,7 +236,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">

diff --git a/src/api/measure/measureDept.ts b/src/api/measure/measureDept.ts
index 9a30ce3..3d34a2b 100644
--- a/src/api/measure/measureDept.ts
+++ b/src/api/measure/measureDept.ts
@@ -43,3 +43,11 @@
     data,
   })
 }
+// 获取父级组织
+export function getpDeptApi(data: object) {
+  return request({
+    url: '/meter/organize/deptInfo',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index 9f38397..90ae2a7 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -8,8 +8,10 @@
 export interface listParamsType {
   noticeNo: string // 编号
   noticePublisher: string // 发布人
-  noticeTime: string // 发布时间
+  noticeTime?: string // 发布时间
   noticeTitle: string // 标题
+  noticeStartTime: string // 标题
+  noticeEndTime: string // 标题
   limit: number
   offset: number
 }
@@ -43,4 +45,29 @@
     data,
   })
 }
+// 通知公告删除
+export function removeNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/delete`,
+    method: 'post',
+    data,
+  })
+}
+// 通知公告编辑
+export function updateNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+  })
+}
+// 导出通知公告
+export function exportNoticeApi(data: object) {
+  return request({
+    url: `${prefix}/notice/update`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
 
diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts
index 1798ce5..7b61c3f 100644
--- a/src/api/system/tool.ts
+++ b/src/api/system/tool.ts
@@ -72,7 +72,7 @@
   templateNo: string // 编号
   templateName: string // 名称
   templateCreator: string // 负责人
-  createTime: string // 创建时间
+  // createTime: string // 创建时间
   limit: number
   offset: number
   templateType: string
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
index 66dd307..7f8f5ce 100644
--- a/src/views/device/borrow/borrow-interface.ts
+++ b/src/views/device/borrow/borrow-interface.ts
@@ -10,6 +10,7 @@
   time: string // 	申请日期
   limit?: number
   offset?: number
+  ids?: string[]
 }
 // 借用设备类型
 export interface borrowDeviceType {
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index bca0958..470bad1 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -15,6 +15,13 @@
 watch(current, (newValue) => {
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
+onUnmounted(() => {
+  sessionStorage.setItem('deviceBorrowHandler', current.value)
+})
+onMounted(() => {
+  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
+  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+})
 </script>
 
 <template>
@@ -28,7 +35,7 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" />
+    <component :is="currentComp" :status="current" />
   </div>
 </template>
 
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 240fffa..ec43b86 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -14,6 +14,7 @@
 })
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive<searchType>({
   applyName: '', // 申请名称
   applyNo: '', // 申请编号
@@ -23,9 +24,20 @@
   createUser: '', // 	创建人
   processResult: '', // 	处置结果
   time: '', // 	申请日期
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 全部状态的表格数据
@@ -217,6 +229,7 @@
   searchQuery.applyPerson = ''
   searchQuery.applyUnit = ''
   searchQuery.time = ''
+  time.value = ''
   getList()
 }
 // 新增
@@ -232,6 +245,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -239,10 +258,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   exportApply({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '设备借用申请')
     loading.close()
+    // searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -352,11 +376,20 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model="searchQuery.equipmentCategory" placeholder="设备类型" clearable class="w-50 m-2" /> -->
-          <el-date-picker
+          <!-- <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"
+          /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
           />
         </search-item>
       </search-area>
@@ -374,7 +407,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -425,7 +460,7 @@
               </template>
             </el-table-column>
             <!-- 未通过/已通过状态的操作栏 -->
-            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="170" fixed="right">
+            <el-table-column v-if="props.type === '4' || props.type === '5'" label="操作" align="center" width="90" fixed="right">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index ff89b3a..7f74981 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -1,48 +1,65 @@
 <script lang="ts" setup name="borrowHandleList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
+const props = defineProps({
+  status: {
+    type: String,
+    required: true,
+  },
+})
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+const time = ref()
 const searchQuery = reactive({
+  applyNo: '',
+  applyName: '',
+  applyUnit: '',
+  applyPerson: '',
   limit: 10,
   offset: 1,
+  ids: [],
 }) // 查询参数
+watch(() => time.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.noticeStartTime = newVal[0]
+    // searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.noticeStartTime = ''
+    // searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请名称',
-    value: 'name',
-    width: '180',
+    value: 'applyName',
     align: 'center',
   },
   {
     text: '申请部门',
-    value: 'dept',
-    width: '180',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'user',
-    width: '180',
+    value: 'applyPerson',
     align: 'center',
   },
   {
     text: '申请时间',
     value: 'time',
-    width: '200',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -67,7 +84,6 @@
   extarCss: '',
 })
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -83,20 +99,20 @@
   // })
   list.value = [
     {
-      name: 'test1',
-      no: '1234',
-      dept: '顶级',
-      user: '张三',
+      applyName: '借用测试设备',
+      applyNo: '1433223',
+      applyUnit: '顶级',
+      applyPerson: '张三',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '审批中',
     },
     {
-      name: 'test2',
-      no: '1234',
-      dept: '徐州分中心',
-      user: '里斯',
+      applyName: '借用电脑',
+      applyNo: '1433223',
+      applyUnit: '徐州分中心',
+      applyPerson: '里斯',
       time: '2020-12-12 00:00:00',
-      status: '已通过',
+      approvalStatusName: '已通过',
     },
   ] as any
   total.value = 2
@@ -126,7 +142,7 @@
     },
     query: {
       title: '详情',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
@@ -144,14 +160,14 @@
     },
     query: {
       title: '编辑',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
-    `确认删除${row.equipmentName}吗？`,
+    `确认删除${row.applyName}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -188,8 +204,29 @@
 const identify = () => {
 
 }
-const borrow = () => {
-
+// 借用
+const borrow = (row) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+}
+// 归还
+const returnBtn = (row) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
 }
 // 新增
 const addBtn = () => {
@@ -204,10 +241,16 @@
     },
     query: {
       title: '新建',
-      name: '',
+      name: '设备借用处理',
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -215,10 +258,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -245,20 +293,29 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.assetNo" placeholder="申请编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyNo" placeholder="申请编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="申请名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyName" placeholder="申请名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.modelNo" placeholder="申请部门" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.applyUnit" placeholder="申请部门" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请人" clearable class="w-50 m-2" />
+          <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.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" />
+          <!-- <el-input v-model="searchQuery.equipmentSpecifications" placeholder="申请日期" clearable class="w-50 m-2" /> -->
+          <el-date-picker
+            v-model="time"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="申请开始时间"
+            end-placeholder="申请结束时间"
+            clearable
+          />
         </search-item>
       </search-area>
       <table-container>
@@ -275,7 +332,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
@@ -285,15 +344,18 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="140" fixed="right">
+            <el-table-column label="操作" align="center" :width="status === '待借用' ? '130' : status === '已借用' ? '110' : '80'">
               <template #default="{ row }">
                 <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="borrow(row)">
+                <el-button v-if="status === '待借用'" size="small" type="primary" link @click="borrow(row)">
                   借用
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="status === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                  归还
+                </el-button>
+                <el-button v-if="status === '待借用'" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 242b40e..5234d0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -198,7 +198,6 @@
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, value: string) => {
-  console.log(row)
   if (value === '查看') {
     $router.push({
       name: 'standardListAdd',
@@ -328,10 +327,8 @@
 const uploadAll = () => {
   upload()
 }
+// 新建
 const add = () => {
-  // buttonArray.value = ['提交', '保存']
-  // buttonType.value = ''
-  // show.value = false
   $router.push({
     name: 'standardListAdd',
     params: {
@@ -340,6 +337,7 @@
     query: {
       title: '新建',
       name: props.name,
+      applyType: props.applyType,
     },
   })
 }
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 96aabeb..002a43b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -4,11 +4,12 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import { conditionalExpression } from '@babel/types'
 import type { IOptions } from '../standard_interface'
-import UserListDialog from './userListDialog.vue'
+import UserListDialog from '../../../stateManage/components/addRow.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisAdd, getStandardLisdetali, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
@@ -21,6 +22,7 @@
 } // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
   if (pageType.value === 'add') {
@@ -83,40 +85,17 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [
-    {
-      createTime: '',
-      createUser: 0,
-      equipmentId: 0,
-      id: 0,
-      isDel: 0,
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
+  applyEquipmentList: [],
   applyNo: '',
-  applyType: '',
+  applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
   approvalStatusName: '',
   constructionStandardUnitName: '',
-  createTime: '',
-  createUser: '',
-  fileList: [
-    {
-      createTime: '',
-      createUser: 0,
-      fileName: '',
-      id: 0,
-      isDel: 0,
-      minioFileName: '',
-      remark: '',
-      standardApplyId: 0,
-      updateTime: '',
-    },
-  ],
-  id: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
   isDel: 0,
   processId: '',
   remark: '',
@@ -124,8 +103,8 @@
   standardName: '',
   standardNo: '',
   standardOwner: '',
-  updateTime: '',
-  version: '',
+  updateTime: null,
+  version: null,
 })
 
 const checkTypeOptions = ref<IOptions[]>([])
@@ -220,6 +199,7 @@
   align: string
   required: Boolean
   choose: Boolean
+  time: Boolean
 }
 // 申请文档列表
 const filesList = ref([])
@@ -227,59 +207,67 @@
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'name',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: true,
+    time: false,
   },
   {
     text: '设备编号',
-    value: 'bianhao',
+    value: 'assetNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '型号',
-    value: 'xinghao',
+    value: 'modelNo',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '测量范围',
-    value: 'fanwei',
+    value: 'assetTypeName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '使用部门',
-    value: 'bumen',
+    value: 'purpose',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定时间',
-    value: 'time',
+    value: 'manufacturingDate',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '检定结果',
-    value: 'jieguo',
+    value: 'managerStateName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '有效日期',
-    value: 'riqi',
+    value: 'mesureCycleName',
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
 ])
 // 标准配套设备更换查询条件
@@ -297,6 +285,7 @@
     align: 'center',
     required: true,
     choose: false,
+    time: false,
   },
   {
     text: '上传时间',
@@ -304,12 +293,14 @@
     align: 'center',
     required: true,
     choose: false,
+    time: true,
   },
   {
     text: '文件说明',
     value: 'remark',
     align: 'center',
     required: true,
+    time: false,
     choose: false,
   },
   {
@@ -317,6 +308,7 @@
     value: 'minioFileName',
     align: 'center',
     required: true,
+    time: false,
     choose: true,
   },
 ])
@@ -404,15 +396,17 @@
 }
 // 选择标准配套设备
 const userListDialog = ref()
-
+// 第几条数据选择
+const listIndex = ref(0)
 // 点击标准配套设备选择按钮
-const chooseList = (row: object) => {
-  console.log(row)
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
   userListDialog.value.initDialog()
 }
 // 选择完成之后的回调
-const confirmPerson = (e: any) => {
-  console.log(e)
+const confirmPerson = (row: any) => {
+  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
+  console.log(fromListInfo.value)
 }
 // 增加申请文档列表
 const addRow = () => {
@@ -480,7 +474,9 @@
 const getAddList = (item: string) => {
   if (item === '提交' || item === '保存') {
     getStandardLisAdd(fromListInfo.value).then((res) => {
-      console.log(res)
+      if (res.code === '200') {
+        close()
+      }
     })
   }
   else {
@@ -503,14 +499,7 @@
 }
 // 点击增加行
 const addRoow = () => {
-  // const params = {
-  //   equipmentName: '',
-  //   equipmentNo: '',
-  //   equipmentType: '',
-  //   depreciationMethod: '',
-
-  // }
-  list.value.push({})
+  fromListInfo.value.applyEquipmentList.push({})
 }
 // 点击关闭
 const handleClose = () => {
@@ -612,7 +601,7 @@
           <el-col :span="6">
             <el-form-item label="标准名称:" prop="standardName">
               <el-select
-                v-model.trim="fromListInfo.id"
+                v-model.trim="fromListInfo.standardEquipmentId"
                 clearable
                 placeholder="标准名称"
                 size="default"
@@ -1004,18 +993,18 @@
           标准配套设备更换
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary">
+          <el-button v-if="pageType !== 'detail'" type="primary">
             批量选择
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="primary"
             @click="addRoow"
           >
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('1')"
           >
@@ -1024,7 +1013,7 @@
         </span>
       </div>
       <el-table
-        :data="list"
+        :data="fromListInfo.applyEquipmentList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -1050,8 +1039,8 @@
               <template v-if="item.choose" #append>
                 <el-button
                   size="small"
-                  :disabled="buttonType === '查看'"
-                  @click="chooseList(scope.row)"
+                  :disabled="pageType === 'detail'"
+                  @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1065,11 +1054,11 @@
           申请文档
         </div>
         <span class="btns">
-          <el-button v-if="buttonType !== '查看'" type="primary" @click="addRow">
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
             增加行
           </el-button>
           <el-button
-            v-if="buttonType !== '查看'"
+            v-if="pageType !== 'detail'"
             type="info"
             @click="removeRow('2')"
           >
@@ -1096,7 +1085,16 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
+            <el-date-picker
+              v-if="item.time"
+              v-model="scope.row[item.value]"
+              type="datetime"
+              placeholder="请选择发证日期"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
             <el-input
+              v-else
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
@@ -1114,7 +1112,7 @@
                   :on-change="handleFileChange"
                   :limit="1"
                 >
-                  <el-button :disabled="buttonType === '查看'" style="line-height: 2.5;">
+                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
                     上传
                   </el-button>
                 </el-upload>
@@ -1123,7 +1121,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div v-if="buttonType === '查看'" class="header">
+      <div v-if="pageType === 'detail'" class="header">
         <div class="title">
           审批流程
         </div>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index eb7ced3..1263b6c 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -93,7 +93,7 @@
   ).then(() => {
     current.value = '基本信息'
     currentCompRef.value.submitForm().validate().then(() => {
-      pageType.value === ''
+      pageType.value === 'add'
         ? getStandardListAdd(formInline.value).then((res) => {
           if (res.code === 200) {
             close()
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index e858700..17367cb 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -46,7 +46,7 @@
   },
   {
     text: '传递范围',
-    value: 'transmitRange',
+    value: 'transmitRangeName',
     align: 'center',
   },
   {
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index caf81b3..f69b781 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -18,17 +18,29 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const validDate = ref()
 const searchQuery = reactive({
   equipmentNo: '', // 设备编号
   equipmentName: '', // 名称
   mesureType: '', // 鉴定方式
   managerState: '', // 管理状态
   useDept: '', // 使用部门
-  validDate: '', // 有效日期
+  // validDate: '', // 有效日期
   abc: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
+watch(() => validDate.value, (newVal) => {
+  if (newVal) {
+    // searchQuery.createStartTime = newVal[0]
+    // searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    // searchQuery.createStartTime = ''
+    // searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -239,6 +251,7 @@
 // 重置
 const reset = () => {
   // searchQuery.fileNo = ''
+  validDate.value = ''
   getList()
 }
 // 模板下载
@@ -263,6 +276,12 @@
 const identify = () => {
 
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   // const loading = ElLoading.service({
@@ -270,10 +289,15 @@
   //   text: 'Loading',
   //   background: 'rgba(255, 255, 255, 0.8)',
   // })
-
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   // exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
   //   exportFile(res.data, props.name)
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -305,11 +329,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getList()
   fetchData()
@@ -323,13 +342,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable>
+          <el-select v-model="searchQuery.mesureType" class="m-2" placeholder="检定方式" clearable style="width: 185px;">
             <el-option
               v-for="item in mesureTypeList"
               :key="item.id"
@@ -339,7 +358,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable>
+          <el-select v-model="searchQuery.managerState" class="m-2" placeholder="管理状态" clearable style="width: 185px;">
             <el-option
               v-for="item in managerStateList"
               :key="item.id"
@@ -349,17 +368,27 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 100%;" />
+          <dept-select v-model="searchQuery.useDept" :data="useDeptList" placeholder="使用部门" style="width: 185px;" />
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="validDate"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="有效开始时间"
+            end-placeholder="有效结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.validDate" type="datetime" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="有效日期"
             class="normal-date"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable>
+          <el-select v-model="searchQuery.abc" class="m-2" placeholder="ABC" clearable style="width: 185px;">
             <el-option
               v-for="item in abcList"
               :key="item.id"
@@ -405,7 +434,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/standingBook/fixedAssets.vue b/src/views/device/standingBook/fixedAssets.vue
index d0b26b6..cddb285 100644
--- a/src/views/device/standingBook/fixedAssets.vue
+++ b/src/views/device/standingBook/fixedAssets.vue
@@ -1,7 +1,7 @@
 <!-- 固定资产页面 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/fixedAssetsAdd.vue'
+// import addDialog from './components/fixedAssetsAdd.vue'
 import type { fixedAssetsType, selectType } from './standingBook-interface'
 import { exportFile } from '@/utils/exportUtils'
 import { assetsDeleteApi, listExportApi, listImporttApi, listPageApi } from '@/api/device/standingBook'
@@ -17,6 +17,7 @@
   equipmentCategory: '', // 设备类型
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -215,6 +216,12 @@
   //   title: '新建',
   // })
 }
+// 表格被选中的行
+const selectList = ref<fixedAssetsType[]>([])
+// 表格多选
+const multiSelect = (row: fixedAssetsType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -222,10 +229,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, '固定资产列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -314,7 +326,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 2f7cf28..46f98b4 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -50,24 +50,40 @@
   id: '',
 })
 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' }],
-}) // 表单验证规则
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
+  time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+})
+watch(() => ruleForm1.value, (newVal) => {
+  if (newVal.applyUnit) {
+    ruleFormRef1.value.validateField('applyUnit')
+  }
+  if (newVal.applyPerson) {
+    ruleFormRef1.value.validateField('applyPerson')
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const rules2 = ref<FormRules>({
   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 ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
+watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
+  for (const key in newVal) {
+    if (newVal[key]) {
+      ruleArr.includes(key) ? ruleFormRef2.value.validateField(key) : ''
+    }
+  }
+}, {
+  deep: true,
+  immediate: true,
+})
 const assetTypeList = ref<selectType[]>([]) // 资产类型
 const ABCList = ref<selectType[]>([]) // ABC
 const mesureTypeList = ref<selectType[]>([]) // 检定方式
@@ -493,6 +509,13 @@
     else {
       console.log(row[0], '选中的设备')
       const device = row[0]
+      ruleForm1.value.equipmentNo = device.equipmentNo
+      ruleForm1.value.equipmentName = device.equipmentName
+      ruleForm1.value.modelNo = device.modelNo
+      ruleForm1.value.equipmentSpecifications = device.equipmentSpecifications
+      ruleForm1.value.manufacturingNo = device.manufacturingNo
+      ruleForm1.value.manufacturer = device.manufacturer
+      ruleFormRef1.value.clearValidate('equipmentNo')
     }
   }
   // row.forEach((element) => {
@@ -579,13 +602,13 @@
       <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">
-              <dept-select v-model="ruleForm1.useDept" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+            <el-form-item label="申请单位" prop="applyUnit">
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
             </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-form-item label="申请人" prop="applyPerson">
+              <el-select v-model="ruleForm1.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>
@@ -631,10 +654,10 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="闲置时间" prop="time">
+            <el-form-item :label="name.substring(2, 4)" prop="time">
               <el-date-picker
                 v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '闲置时间'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
             </el-form-item>
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index fd576ff..d98c06f 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -33,6 +33,7 @@
   createUser: '', // 创建人
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
+  ids: [] as string[],
   limit: 20,
   offset: 1,
 }) // 查询参数
@@ -41,62 +42,52 @@
 const columns = ref([
   {
     text: '申请编号',
-    value: 'no',
-    width: '180',
+    value: 'applyNo',
     align: 'center',
   },
   {
     text: '申请类型',
-    value: 'type',
-    width: '150',
+    value: 'applyTypeName',
     align: 'center',
   },
   {
     text: '设备编号',
-    value: '',
-    width: '150',
+    value: 'equipmentNo',
     align: 'center',
   },
   {
     text: '设备名称',
-    value: 'name',
-    width: '150',
+    value: 'equipmentName',
     align: 'center',
   },
   {
     text: '型号',
-    value: '',
-    width: '150',
+    value: 'modelNo',
     align: 'center',
   },
   {
     text: '设备状态',
-    value: '',
-    width: '150',
+    value: 'managerStateName',
     align: 'center',
   },
   {
     text: '申请单位',
-    value: '',
-    width: '150',
+    value: 'applyUnit',
     align: 'center',
   },
   {
     text: '申请人',
-    value: 'managerLevelName',
-    width: '150',
+    value: 'applyPerson',
     align: 'center',
   },
   {
-    text: '申请时间',
+    text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
-    width: '180',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'status',
-    width: '180',
+    value: 'approvalStatusName',
     align: 'center',
   },
 ]) // 表格
@@ -135,6 +126,21 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
+  list.value = [
+    {
+      applyNo: 'sbxz20230103',
+      applyTypeName: `${props.name.substring(2, 4)}申请`,
+      equipmentNo: 'device20230103',
+      equipmentName: '测试设备',
+      modelNo: 'CL001',
+      managerStateName: '在用',
+      applyUnit: '徐州分中心',
+      applyPerson: '超级管理员',
+      time: '2023-1-3 13:47',
+      approvalStatusName: '审批中',
+    },
+  ]
+  total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -266,6 +272,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref([])
+// 表格多选
+const multiSelect = (row) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -275,8 +287,14 @@
   })
 
   // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
+  // if (selectList.value.length) {
+  //   selectList.value.forEach((item) => {
+  //     searchQuery.ids?.push(item.id as string)
+  //   })
+  // }
   //   exportFile(res.data, '固定资产列表')
   //   loading.close()
+  // searchQuery.ids = []
   // }).catch((_) => {
   //   loading.close()
   // })
@@ -393,7 +411,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index 9b84368..d21e97b 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -19,17 +19,44 @@
 })
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
+const publishTime = ref()
+const effectiveTime = ref()
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
+  // publishTime: '', // 发布时间
   fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
+  // effectiveTime: '', // 实施时间
   effectiveStatus: '', // 实施状态
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  publishEndTime: '',
+  publishStartTime: '',
   limit: 20,
   offset: 1,
   fileType: '', // 类型
+  ids: [] as string[],
 }) // 查询参数
+watch(() => publishTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.publishStartTime = newVal[0]
+    searchQuery.publishEndTime = newVal[1]
+  }
+  else {
+    searchQuery.publishStartTime = ''
+    searchQuery.publishEndTime = ''
+  }
+})
+watch(() => effectiveTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.effectiveStartTime = newVal[0]
+    searchQuery.effectiveEndTime = newVal[1]
+  }
+  else {
+    searchQuery.effectiveStartTime = ''
+    searchQuery.effectiveEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -80,12 +107,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.publishTime) {
-    searchQuery.publishTime = ''
-  }
-  if (!searchQuery.effectiveTime) {
-    searchQuery.effectiveTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -177,11 +198,15 @@
 }
 // 重置
 const reset = () => {
+  publishTime.value = ''
+  searchQuery.publishStartTime = ''
+  searchQuery.publishEndTime = ''
+  effectiveTime.value = ''
+  searchQuery.effectiveStartTime = ''
+  searchQuery.effectiveEndTime = ''
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
   searchQuery.effectiveStatus = ''
   getList()
 }
@@ -203,6 +228,12 @@
     },
   })
 }
+// 表格被选中的行
+const selectList = ref<fileListType[]>([])
+// 表格多选
+const multiSelect = (row: fileListType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -210,10 +241,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportFileApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -264,13 +300,13 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" style="width: 187px;" />
         </search-item>
         <!-- <search-item>
           <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
@@ -284,18 +320,38 @@
         </search-item> -->
         <search-item>
           <el-date-picker
+            v-model="publishTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="发布开始时间"
+            end-placeholder="发布结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.publishTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="发布时间"
-          />
+          /> -->
         </search-item>
         <search-item>
           <el-date-picker
+            v-model="effectiveTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="实施开始时间"
+            end-placeholder="实施结束时间"
+            clearable
+            style="width: 360px;"
+          />
+          <!-- <el-date-picker
             v-model="searchQuery.effectiveTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="实施时间"
-          />
+          /> -->
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable>
+          <el-select v-model="searchQuery.effectiveStatus" class="m-2" placeholder="实施状态" clearable style="width: 187px;">
             <el-option
               v-for="item in effectiveStatusSelect"
               :key="item.id"
@@ -323,7 +379,7 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true" @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 04b1388..585d618 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -2,13 +2,18 @@
 export interface fileSearchType {
   fileNo: string // 编号
   fileName: string // 名称
-  publishTime: string // 发布时间
+  // publishTime: string // 发布时间
   fileCode: string // 文件号
-  effectiveTime: string // 实施时间
+  // effectiveTime: string // 实施时间
   effectiveStatus: string // 实施状态
   limit: number
   offset: number
   fileType: string // 类型
+  publishStartTime: string
+  publishEndTime: string
+  effectiveEndTime: string
+  effectiveStartTime: string
+  ids: string[]
 }
 // 文件返回值类型
 export interface fileListType {
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index b9557f5..4eb62ec 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -7,7 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getStaffDetail, getStaffList } from '@/api/measure/person'
 import type { userType } from '@/views/system/user/user-interface'
-import { listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
+import { getpDeptApi, listPageApi, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -23,6 +23,13 @@
   pDeptId: '',
   pDeptName: '',
 }) // 表单
+// 展示父级组织
+const pDept = ref({
+  pDeptName: '',
+  pOrganizeNo: '',
+  ppDeptName: '',
+  ppOrganizeNo: '',
+})
 const title = ref('')
 const path = ref('')
 const rules = ref<FormRules>({
@@ -361,12 +368,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '3',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '科室')
       changeList_bm.value[0].data = res.data.rows
     })
   }
@@ -378,12 +385,12 @@
       limit: 9999,
       offset: 1,
       organizeType: '4',
-      createTime: '', // 创建时间
+      createEndTime: '', // 创建时间
+      createStartTime: '', // 创建时间
       director: '', // 负责人
       meterMajor: '', // 专业
       pDeptId: ruleForm.value.deptId, // 所属科室
     }).then((res) => {
-      console.log(res, '工程组')
       changeList_ks.value[0].data = res.data.rows
     })
   }
@@ -448,11 +455,25 @@
   else if (title.value.split('-')[1] === '科室') {
     changeList.value = changeList_ks.value
     current.value = changeList_ks.value[0].name
+    // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+    })
   }
   else if (title.value.split('-')[1] === '工程组') {
     changeList.value = changeList_gcz.value
     current.value = changeList_gcz.value[0].name
     // 获取所属部门
+    getpDeptApi({ deptId: ruleForm.value.deptId }).then((res) => {
+      pDept.value.pDeptName = res.data.pDeptName
+      pDept.value.pOrganizeNo = res.data.pOrganizeNo
+      getpDeptApi({ deptId: res.data.pDeptId }).then((res) => {
+        pDept.value.ppDeptName = res.data.pDeptName
+        pDept.value.ppOrganizeNo = res.data.pOrganizeNo
+      })
+    })
+    console.log(pDept.value, 'pDept.value')
   }
 }
 onMounted(() => {
@@ -485,34 +506,34 @@
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col v-if="title.split('-')[1] === '科室'" :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row v-if="title.split('-')[1] === '工程组'" :gutter="24">
           <el-col :span="6">
             <el-form-item label="科室编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.pOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.pDeptName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门编号">
-              <el-input v-model.trim="ruleForm.pDeptId" disabled />
+              <el-input v-model.trim="pDept.ppOrganizeNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属部门名称">
-              <el-input v-model.trim="ruleForm.pDeptName" disabled />
+              <el-input v-model.trim="pDept.ppDeptName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/rowAddDialog.vue b/src/views/measure/measureDept/components/rowAddDialog.vue
deleted file mode 100644
index 547e11a..0000000
--- a/src/views/measure/measureDept/components/rowAddDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!-- 添加证书信息弹窗 -->
-<script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-const formLabelWidth = '140px'
-const form = reactive({
-  certificateNo: '', // 证书号
-  certificateName: '', // 证书名称
-  certificateCompany: '', // 发证单位
-  certificateDate: '', // 发证日期
-  validDate: '', // 有效日期
-})
-const ruleFormRef = ref<FormInstance>()
-const rules = reactive<FormRules>({
-  certificateNo: [
-    { required: true, message: '请输入证书号', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  certificateName: [{ required: true, message: '请输入证书名称', trigger: 'blur' }],
-  certificateCompany: [{ required: true, message: '请输入发证单位', trigger: 'blur' }],
-  certificateDate: [{ required: true, message: '请选择发证日期', trigger: 'blur' }],
-  validDate: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
-})
-const initDialog = () => {
-  dialogFormVisible.value = true
-}
-defineExpose({ initDialog })
-// 点击保存
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      emits('add', form)
-      dialogFormVisible.value = false
-    }
-  })
-}
-// 取消
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  formEl.resetFields()
-  dialogFormVisible.value = false
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="添加证书信息">
-    <el-form
-      ref="ruleFormRef" :model="form"
-      :rules="rules"
-    >
-      <el-form-item label="证书号" :label-width="formLabelWidth" prop="certificateNo">
-        <el-input v-model="form.certificateNo" placeholder="证书号" />
-      </el-form-item>
-      <el-form-item label="证书名称" :label-width="formLabelWidth" prop="certificateName">
-        <el-input v-model="form.certificateName" placeholder="证书名称" />
-      </el-form-item>
-      <el-form-item label="发证单位" :label-width="formLabelWidth" prop="certificateCompany">
-        <el-input v-model="form.certificateCompany" placeholder="发证单位" />
-      </el-form-item>
-      <el-form-item label="发证日期" :label-width="formLabelWidth" prop="certificateDate">
-        <el-date-picker
-          v-model="form.certificateDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择发证日期"
-        />
-      </el-form-item>
-      <el-form-item label="有效日期" :label-width="formLabelWidth" prop="validDate">
-        <el-date-picker
-          v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择有效日期"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm(ruleFormRef)">确认</el-button>
-        <el-button @click="resetForm(ruleFormRef)">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 50918a0..0403c93 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -3,7 +3,7 @@
 import { ElLoading } from 'element-plus'
 import type { rowType, searchQueryType } from '../measureDept-interface'
 import type { fileResType } from '@/views/measure/file/file-interface'
-import { exportApi, listPageApi } from '@/api/measure/measureDept'
+import { exportApi, getpDeptApi, listPageApi } from '@/api/measure/measureDept'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -20,17 +20,30 @@
 const $router = useRouter()
 const $route = useRoute()
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
   limit: 20,
   offset: 1,
   organizeType: '', // 类型
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
   director: '', // 负责人
   meterMajor: '', // 专业
   pDeptId: '', // 所属科室
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 // 表格数据根据不同组织筛选
@@ -91,7 +104,7 @@
   standard: '',
   extarCss: '',
 })
-const list = ref([]) // 表格数据
+const list = ref<rowType[]>([]) // 表格数据
 // 获取类型
 const getType = async () => {
   const res = await getDictByCode('deptType')
@@ -106,7 +119,9 @@
     limit: 99999,
     offset: 1,
     organizeType: '3',
-    createTime: '', // 创建时间
+    // createTime: '', // 创建时间
+    createEndTime: '',
+    createStartTime: '',
     director: '', // 负责人
     meterMajor: '', // 专业
     pDeptId: '', // 所属科室
@@ -117,13 +132,16 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows.map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
+      list.value = (res.data.rows as rowType[]).map(item => ({ ...item, createTime: item.createTime.split(' ')[0] }))
       total.value = res.data.total
+      if (props.authority === 'gcz') {
+        list.value.forEach(async (item) => {
+          const res = await getpDeptApi({ deptId: item.deptId })
+          item.pDeptName = res.data.pDeptName
+        })
+      }
     }
     loadingTable.value = false
   }).catch((_) => {
@@ -175,15 +193,22 @@
 }
 // 重置
 const reset = () => {
+  createTime.value = ''
   searchQuery.organizeNo = '' // 组织编号
   searchQuery.organizeName = '' // 名称
+  searchQuery.pDeptId = ''
   searchQuery.limit = 10
   searchQuery.offset = 1
-  searchQuery.createTime = '' // 创建时间
   searchQuery.director = '' // 负责人
   searchQuery.meterMajor = '' // 专业
   getList()
 }
+// 表格被选中的行
+const selectList = ref<rowType[]>([])
+// 表格多选
+const multiSelect = (row: rowType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -191,9 +216,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, props.name)
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -229,16 +260,26 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室" clearable>
             <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
           <el-date-picker
             v-if="props.name.split('-')[1] === '科室'"
+            v-model="createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
+          />
+          <!-- <el-date-picker
+            v-if="props.name.split('-')[1] === '科室'"
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-          />
+          /> -->
         </search-item>
       </search-area>
       <table-container>
@@ -260,7 +301,8 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
-          @change="changePage"
+          :is-multi="true"
+          @change="changePage" @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 5f7f5e7..f7911fa 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -9,6 +9,9 @@
   director?: string // 负责人
   meterMajor?: string // 专业
   pDeptId?: string // 所属科室
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 
 export interface columnType {
@@ -35,6 +38,7 @@
   organizeNo: string
   organizeType: string
   pDeptId: string
+  pDeptName: string
   phone: string
   remark: string
   technologyJob: string
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index a566b78..01c5266 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -31,6 +31,7 @@
   remindType: '',
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -237,6 +238,12 @@
   //   name: props.isRemind ? '证书状况' : '证书记录',
   // })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -244,9 +251,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   CertificateListList({ ...searchQuery }).then((res) => {
     exportFile(res.data, '证书记录列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -278,11 +291,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -347,7 +355,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d3a1ea9..7a90e93 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -20,6 +20,7 @@
   certificateStatus: '', // 证书状态
   limit: 20,
   offset: 1,
+  ids: [] as string[],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -166,6 +167,12 @@
     path: '/person/detail',
   })
 }
+// 表格被选中的行
+const selectList = ref<StaffType[]>([])
+// 表格多选
+const multiSelect = (row: StaffType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -173,9 +180,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   exportList({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
     exportFile(res.data, '计量人员列表')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -210,11 +223,6 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-// 传给子组件的刷新事件
-const refreshDta = () => {
-  getList()
-  dialogVisible.value = false
-}
 onMounted(() => {
   getDeptList()
   getList()
@@ -272,7 +280,9 @@
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
+          :is-multi="true"
           @change="changePage"
+          @multi-select="multiSelect"
         >
           <template #preColumns>
             <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts
index d116841..e510a2c 100644
--- a/src/views/measure/person/person-interface.ts
+++ b/src/views/measure/person/person-interface.ts
@@ -9,6 +9,7 @@
   remindType?: string
   limit: number
   offset: number
+  ids?: string[]
 }
 // 计量人员类型
 export interface StaffType {
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index 600eda1..acfa5e0 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -4,12 +4,13 @@
 import { ElMessage } from 'element-plus'
 import dayjs from 'dayjs'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { addNoticeApi, uploadApi } from '@/api/system/notice'
+import { addNoticeApi, getNoticeDetail, updateNoticeApi, uploadApi } from '@/api/system/notice'
 import { getPhotoUrl } from '@/api/system/tool'
 import useUserStore from '@/store/modules/user'
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
 const emits = defineEmits(['resetData'])
 const userInfo = useUserStore()
+const title = ref('')
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive({
   noticeNo: '', // 通知公告编号
@@ -20,6 +21,7 @@
   noticeContent: '', // 发布内容
   minioFileName: '', // 上传文件名
   noticeTitle: '', // 标题
+  id: '',
 }) // 表单
 const rules = ref<FormRules>({
   noticeTitle: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
@@ -28,11 +30,36 @@
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 // 弹窗初始化
-const initDialog = () => {
+const initDialog = (row: any) => {
   dialogVisible.value = true
-  ruleForm.noticePublisher = userInfo.$state.name
-  ruleForm.noticeCompany = userInfo.$state.deptName
-  ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  title.value = row.title
+  if (row.title === '新建') {
+    ruleForm.noticePublisher = userInfo.$state.name
+    ruleForm.noticeCompany = userInfo.$state.deptName
+    ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else {
+    // 获取详情信息
+    getNoticeDetail({
+      noticeNo: row.noticeNo,
+      noticePublisher: row.noticePublisher,
+      noticeTitle: row.noticeTitle,
+      noticeEndTime: '',
+      noticeStartTime: '',
+    }).then((res) => {
+      if (res.code === 200 && res.data.rows.length) {
+        ruleForm.noticeNo = res.data.rows[0].noticeNo
+        ruleForm.noticePublisher = res.data.rows[0].noticePublisher
+        ruleForm.noticeCompany = res.data.rows[0].noticeCompany
+        ruleForm.noticeTime = res.data.rows[0].noticeTime
+        ruleForm.noticeSketch = res.data.rows[0].noticeSketch
+        ruleForm.noticeContent = res.data.rows[0].noticeContent
+        ruleForm.minioFileName = res.data.rows[0].minioFileName
+        ruleForm.noticeTitle = res.data.rows[0].noticeTitle
+        ruleForm.id = res.data.rows[0].id
+      }
+    })
+  }
 }
 defineExpose({ initDialog })
 // 重置
@@ -56,15 +83,17 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       ruleForm.noticeTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      addNoticeApi(ruleForm).then((res) => {
-        if (res.code === 200) {
-          close()
-          ElMessage.success('发布成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
+      title.value === '新建'
+        ? addNoticeApi
+        : updateNoticeApi(ruleForm).then((res) => {
+          if (res.code === 200) {
+            close()
+            ElMessage.success('操作成功')
+          }
+          else {
+            ElMessage.error(res.message)
+          }
+        })
     }
   })
 }
@@ -243,7 +272,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" title="添加公告" width="50%" append-to-body class="container">
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index eaa60ae..3001057 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -1,24 +1,38 @@
 <!-- 通知公告 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading } from 'element-plus'
+// import { Delete } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
 // import tableHeader from './tableHeader.vue'
 import addNotice from './noteAdd.vue'
 import noticeDetail from './noticeDetail.vue'
 import type { noticeType } from './notice-interface'
-import { getNoticeeApi } from '@/api/system/notice'
+import { getNoticeeApi, removeNoticeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+// import { exportFile } from '@/utils/exportUtils'
+const noticeTime = ref()
 const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
-  noticeTime: '', // 发布时间
+  // noticeTime: '', // 发布时间
+  noticeStartTime: '',
+  noticeEndTime: '',
   noticeTitle: '', // 标题
   limit: 20,
   offset: 1,
 }) // 查询参数
+watch(() => noticeTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.noticeStartTime = newVal[0]
+    searchQuery.noticeEndTime = newVal[1]
+  }
+  else {
+    searchQuery.noticeStartTime = ''
+    searchQuery.noticeEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns: Ref<TableColumn[]> = ref([])
@@ -55,9 +69,6 @@
 const list = ref([]) // 表格数据
 // 获取通知公告列表
 const getNoticeList = () => {
-  if (!searchQuery.noticeTime) {
-    searchQuery.noticeTime = ''
-  }
   getNoticeeApi(searchQuery).then((res) => {
     total.value = res.data.total
     list.value = res.data.rows
@@ -78,8 +89,10 @@
 const resetSearchQuery = () => {
   searchQuery.noticeNo = ''
   searchQuery.noticePublisher = ''
-  searchQuery.noticeTime = ''
+  noticeTime.value = ''
   searchQuery.noticeTitle = ''
+  searchQuery.noticeStartTime = ''
+  searchQuery.noticeEndTime = ''
 }
 // 查询
 const search = () => {
@@ -93,13 +106,45 @@
 const addDialog = ref() // 添加弹窗组件
 // 新建
 const add = () => {
-  addDialog.value.initDialog()
+  addDialog.value.initDialog({
+    title: '新建',
+  })
+}
+// 删除
+const remove = (row: noticeType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.noticeTitle}吗`,
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    removeNoticeApi({ id: row.id }).then((res) => {
+      ElMessage.success('操作成功')
+      getNoticeList()
+    })
+  })
+}
+// 编辑
+const update = (row: noticeType) => {
+  addDialog.value.initDialog({
+    title: '编辑',
+    ...row,
+  })
 }
 const detailDialog = ref() // 详情组件弹窗
 // 详情
 const detail = (row: noticeType) => {
   detailDialog.value.initDialog(row)
 }
+// 表格被选中的行
+const selectList = ref<noticeType[]>([])
+// 表格多选
+const multiSelect = (row: noticeType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -166,9 +211,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="noticeTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.noticeTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -184,8 +238,9 @@
       </template>
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="searchQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list" :total="total" :columns="columns"
+        :query="searchQuery" :list-loading="loadingTable" :is-showmulti-select="true"
+        :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
@@ -195,11 +250,17 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="100">
+          <el-table-column label="操作" align="center" width="140">
             <template #default="{ row }">
               <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/update')" type="primary" link size="small" @click="update(row)">
+                编辑
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/delete')" type="danger" link size="small" @click="remove(row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts
index a1fc349..2e82ac9 100644
--- a/src/views/system/notice/notice-interface.ts
+++ b/src/views/system/notice/notice-interface.ts
@@ -7,6 +7,6 @@
   noticeNo: string // 	通知公告编号	string
   noticePublisher: string //	发布人	string
   noticeSketch: string //	内容简述	string
-  noticeTime: string //	发布时间	string
+  noticeTime?: string //	发布时间	string
   noticeTitle: string //	通知公告标题	string
 }
diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue
index da36bd8..18435ec 100644
--- a/src/views/system/notice/noticeDetail.vue
+++ b/src/views/system/notice/noticeDetail.vue
@@ -22,8 +22,10 @@
   getNoticeDetail({
     noticeNo: row.noticeNo,
     noticePublisher: row.noticePublisher,
-    noticeTime: row.noticeTime,
+    // noticeTime: row.noticeTime,
     noticeTitle: row.noticeTitle,
+    noticeEndTime: '',
+    noticeStartTime: '',
   }).then((res) => {
     if (res.code === 200 && res.data.rows.length) {
       ruleForm.noticeNo = res.data.rows[0].noticeNo
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 7cd607b..05389a0 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -10,15 +10,28 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
   limit: 20,
   offset: 1,
   signType: '',
+  ids: [],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +51,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -107,7 +117,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.signDirector = ''
   searchQuery.signName = ''
   searchQuery.signNo = ''
@@ -121,6 +133,12 @@
     title: '新增',
   })
 }
+// 表格被选中的行
+const selectList = ref<signType[]>([])
+// 表格多选
+const multiSelect = (row: signType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -128,10 +146,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, '签名管理')
     loading.close()
+    searchQuery.ids = []
   })
     .catch((_) => {
       loading.close()
@@ -181,9 +207,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -202,7 +237,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index cb77376..314ad46 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -10,15 +10,29 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
+  // createTime: '', // 创建时间
   limit: 20,
   offset: 1,
   templateType: '',
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +52,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -106,7 +117,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
@@ -124,6 +137,12 @@
 const exportSele = (row: templateType) => {
   // 下载模板
 }
+// 表格被选中的行
+const selectList = ref<templateType[]>([])
+// 表格多选
+const multiSelect = (row: templateType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -131,9 +150,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
   templateExport(searchQuery).then((res) => {
     exportFile(res.data, '证书报告模板')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -182,9 +207,18 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="创建时间"
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
         />
+        <!-- <el-date-picker
+          v-model="createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="创建时间"
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -203,7 +237,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 4a49f38..f5ce74f 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -9,15 +9,28 @@
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
   templateCreator: '', // 负责人
-  createTime: '', // 创建时间
+  createStartTime: '',
+  createEndTime: '',
   limit: 20,
   offset: 1,
   templateType: '',
+  ids: [] as string[],
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -37,9 +50,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   templatePage(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -105,7 +115,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.templateCreator = ''
   searchQuery.templateName = ''
   searchQuery.templateNo = ''
@@ -123,6 +135,12 @@
 const exportSele = (row: templateType) => {
 //  下载模板
 }
+// 表格被选中的行
+const selectList = ref<templateType[]>([])
+// 表格多选
+const multiSelect = (row: templateType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -130,9 +148,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   templateExport(searchQuery).then((res) => {
     exportFile(res.data, '原始记录模板')
     loading.close()
+    searchQuery.ids = []
   }).catch((_) => {
     loading.close()
   })
@@ -181,9 +208,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="创建时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -202,7 +238,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 7e5f9f7..9be30d2 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -10,15 +10,28 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 const { proxy } = getCurrentInstance() as any
+const createTime = ref()
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
   signDirector: '', // 负责人
-  createTime: '', // 创建时间
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
   limit: 20,
   offset: 1,
   signType: '',
 }) // 查询参数
+watch(() => createTime.value, (newVal) => {
+  if (newVal) {
+    searchQuery.createStartTime = newVal[0]
+    searchQuery.createEndTime = newVal[1]
+  }
+  else {
+    searchQuery.createStartTime = ''
+    searchQuery.createEndTime = ''
+  }
+})
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
 const columns = ref([
@@ -38,9 +51,6 @@
 // 获取数据列表
 const getList = () => {
   loadingTable.value = true
-  if (!searchQuery.createTime) {
-    searchQuery.createTime = ''
-  }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -106,7 +116,9 @@
 }
 // 重置
 const reset = () => {
-  searchQuery.createTime = ''
+  createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
   searchQuery.signDirector = ''
   searchQuery.signName = ''
   searchQuery.signNo = ''
@@ -120,6 +132,12 @@
     title: '新增',
   })
 }
+// 表格被选中的行
+const selectList = ref<signType[]>([])
+// 表格多选
+const multiSelect = (row: signType[]) => {
+  selectList.value = row
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -127,9 +145,18 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
+  if (selectList.value.length) {
+    selectList.value.forEach((item) => {
+      searchQuery.ids?.push(item.id as string)
+    })
+  }
+  else {
+    searchQuery.ids = []
+  }
   exportApi(searchQuery).then((res) => {
     exportFile(res.data, '签章管理')
     loading.close()
+    searchQuery.ids = []
   })
     .catch((_) => {
       loading.close()
@@ -179,9 +206,18 @@
       </search-item>
       <search-item>
         <el-date-picker
+          v-model="createTime"
+          type="datetimerange"
+          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+          range-separator="至"
+          start-placeholder="发布开始时间"
+          end-placeholder="发布结束时间"
+          clearable
+        />
+        <!-- <el-date-picker
           v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
           placeholder="发布时间"
-        />
+        /> -->
       </search-item>
       <!-- <template #btns>
         <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
@@ -200,7 +236,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        @change="changePage"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/tool/tool_interface.ts b/src/views/system/tool/tool_interface.ts
index d01ef36..b682db8 100644
--- a/src/views/system/tool/tool_interface.ts
+++ b/src/views/system/tool/tool_interface.ts
@@ -3,10 +3,13 @@
   signNo: string // 编号
   signName: string// 名称
   signDirector: string // 负责人
-  createTime: string// 创建时间
+  createTime?: string// 创建时间
   limit: number
   offset: number
   signType: string
+  createEndTime?: string
+  createStartTime?: string
+  ids?: string[]
 }
 // signType类型参数
 export interface typeofSign {
@@ -32,7 +35,7 @@
 // 模板列表类型
 export interface templateType {
   title?: string
-  createTime?: string
+  createEndTime?: string
   id?: string
   isDel?: number
   minioFileName: string
@@ -43,5 +46,6 @@
   templateType?: string
   updateTime?: string
   userIdList: string[]
+  createStartTime?: string
 }