diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
new file mode 100644
index 0000000..1365711
--- /dev/null
+++ b/src/api/system/expire.ts
@@ -0,0 +1,20 @@
+/**
+ * 系统管理 - 到期提醒
+ */
+import request from '../index'
+// 列表
+export function getList(params: object) {
+  return request({
+    url: '/system/remind/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateRemind(data: object) {
+  return request({
+    url: '/system/remind/update',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
new file mode 100644
index 0000000..1365711
--- /dev/null
+++ b/src/api/system/expire.ts
@@ -0,0 +1,20 @@
+/**
+ * 系统管理 - 到期提醒
+ */
+import request from '../index'
+// 列表
+export function getList(params: object) {
+  return request({
+    url: '/system/remind/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateRemind(data: object) {
+  return request({
+    url: '/system/remind/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index 7c040fa..c419845 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,25 +1,38 @@
 // 流程管理接口
 import request from '../index'
-const prefix = '/system/label'
 
 // 列表
-export function getLabelList(data: { offset: number; limit: number }) {
+export function getLabelList(params: object) {
   return request({
-    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: '/system/rfid/listPage',
+    method: 'get',
+    params,
+  })
+}
+
+// 删除
+export function delLabel(data: object) {
+  return request({
+    url: '/system/rfid/remove',
     method: 'post',
     data,
   })
 }
 
-// 删除
-export function delLabel(id: string) {
-  const param = {
-    rfid: id,
-  }
+// 导入
+export function importLabel(data: object) {
   return request({
-    url: `${prefix}/delete`,
+    url: '/system/rfid/export',
     method: 'post',
-    data: param,
+    data,
   })
 }
+// 批量导入
 
+export function batchImportLabel(data: object) {
+  return request({
+    url: '/system/rfid/importRfid',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
new file mode 100644
index 0000000..1365711
--- /dev/null
+++ b/src/api/system/expire.ts
@@ -0,0 +1,20 @@
+/**
+ * 系统管理 - 到期提醒
+ */
+import request from '../index'
+// 列表
+export function getList(params: object) {
+  return request({
+    url: '/system/remind/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateRemind(data: object) {
+  return request({
+    url: '/system/remind/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index 7c040fa..c419845 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,25 +1,38 @@
 // 流程管理接口
 import request from '../index'
-const prefix = '/system/label'
 
 // 列表
-export function getLabelList(data: { offset: number; limit: number }) {
+export function getLabelList(params: object) {
   return request({
-    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: '/system/rfid/listPage',
+    method: 'get',
+    params,
+  })
+}
+
+// 删除
+export function delLabel(data: object) {
+  return request({
+    url: '/system/rfid/remove',
     method: 'post',
     data,
   })
 }
 
-// 删除
-export function delLabel(id: string) {
-  const param = {
-    rfid: id,
-  }
+// 导入
+export function importLabel(data: object) {
   return request({
-    url: `${prefix}/delete`,
+    url: '/system/rfid/export',
     method: 'post',
-    data: param,
+    data,
   })
 }
+// 批量导入
 
+export function batchImportLabel(data: object) {
+  return request({
+    url: '/system/rfid/importRfid',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/assets/icons/icon-delete.svg b/src/assets/icons/icon-delete.svg
new file mode 100644
index 0000000..88e4145
--- /dev/null
+++ b/src/assets/icons/icon-delete.svg
@@ -0,0 +1 @@
+<svg t="1693304345270" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4067" width="200" height="200"><path d="M928.16 144H736V64a32 32 0 0 0-32-32H320a32 32 0 0 0-32 32v80H95.84a32 32 0 0 0 0 64H129.6l77.92 698.656A96 96 0 0 0 302.912 992h418.144a96.032 96.032 0 0 0 95.424-85.344L894.4 208h33.728a32 32 0 0 0 0.032-64zM352 96h320v48H352V96z m400.896 803.552a32 32 0 0 1-31.808 28.448H302.912a32 32 0 0 1-31.808-28.448L193.984 208h636.032l-77.12 691.552z" p-id="4068" fill="#3d7eff"></path><path d="M608 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32zM432 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32z" p-id="4069" fill="#3d7eff"></path></svg>

diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
new file mode 100644
index 0000000..1365711
--- /dev/null
+++ b/src/api/system/expire.ts
@@ -0,0 +1,20 @@
+/**
+ * 系统管理 - 到期提醒
+ */
+import request from '../index'
+// 列表
+export function getList(params: object) {
+  return request({
+    url: '/system/remind/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateRemind(data: object) {
+  return request({
+    url: '/system/remind/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index 7c040fa..c419845 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,25 +1,38 @@
 // 流程管理接口
 import request from '../index'
-const prefix = '/system/label'
 
 // 列表
-export function getLabelList(data: { offset: number; limit: number }) {
+export function getLabelList(params: object) {
   return request({
-    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: '/system/rfid/listPage',
+    method: 'get',
+    params,
+  })
+}
+
+// 删除
+export function delLabel(data: object) {
+  return request({
+    url: '/system/rfid/remove',
     method: 'post',
     data,
   })
 }
 
-// 删除
-export function delLabel(id: string) {
-  const param = {
-    rfid: id,
-  }
+// 导入
+export function importLabel(data: object) {
   return request({
-    url: `${prefix}/delete`,
+    url: '/system/rfid/export',
     method: 'post',
-    data: param,
+    data,
   })
 }
+// 批量导入
 
+export function batchImportLabel(data: object) {
+  return request({
+    url: '/system/rfid/importRfid',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/assets/icons/icon-delete.svg b/src/assets/icons/icon-delete.svg
new file mode 100644
index 0000000..88e4145
--- /dev/null
+++ b/src/assets/icons/icon-delete.svg
@@ -0,0 +1 @@
+<svg t="1693304345270" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4067" width="200" height="200"><path d="M928.16 144H736V64a32 32 0 0 0-32-32H320a32 32 0 0 0-32 32v80H95.84a32 32 0 0 0 0 64H129.6l77.92 698.656A96 96 0 0 0 302.912 992h418.144a96.032 96.032 0 0 0 95.424-85.344L894.4 208h33.728a32 32 0 0 0 0.032-64zM352 96h320v48H352V96z m400.896 803.552a32 32 0 0 1-31.808 28.448H302.912a32 32 0 0 1-31.808-28.448L193.984 208h636.032l-77.12 691.552z" p-id="4068" fill="#3d7eff"></path><path d="M608 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32zM432 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32z" p-id="4069" fill="#3d7eff"></path></svg>
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
new file mode 100644
index 0000000..72d45f9
--- /dev/null
+++ b/src/views/system/expire/edit.vue
@@ -0,0 +1,118 @@
+<script lang="ts" setup name="EditExpire">
+import type { Ref } from 'vue'
+import { nextTick, reactive } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { getList, updateRemind } from '@/api/system/expire'
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+const dialogVisible = ref(false)
+const data = ref({
+  createDeptId: 0,
+  createDeptName: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  id: '',
+  remindName: '',
+  remindTime: 0,
+  updateTime: '',
+})
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 表单提交
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        updateRemind(data.value).then((res) => {
+          ElMessage.success('修改成功')
+          dialogVisible.value = false
+          emits('closeRefresh')
+        })
+      }
+    })
+  }
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: any) {
+  dialogVisible.value = true
+  data.value = row
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  emits('closeRefresh')
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="到期提醒-编辑"
+    width="30%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="dataFormRef" :model="data" label-position="left" label-width="80px" class="form-container"
+      size="default" @submit.prevent
+    >
+      <el-row :gutter="24">
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="提醒名称" prop="tips" class="required">
+            <el-input v-model="data.remindName" type="text" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="提醒时间" prop="tips" class="required">
+            <el-input-number v-model="data.remindTime" controls-position="right" placeholder="到期前xx天" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+  width: 100%;
+
+  .full-width-input {
+    width: 100%;
+  }
+
+  .dict-detail {
+    padding: 10px;
+
+    .title {
+      font-size: 16px;
+      font-weight: bold;
+      margin-bottom: 15px;
+    }
+  }
+}
+</style>

diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
new file mode 100644
index 0000000..1365711
--- /dev/null
+++ b/src/api/system/expire.ts
@@ -0,0 +1,20 @@
+/**
+ * 系统管理 - 到期提醒
+ */
+import request from '../index'
+// 列表
+export function getList(params: object) {
+  return request({
+    url: '/system/remind/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateRemind(data: object) {
+  return request({
+    url: '/system/remind/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index 7c040fa..c419845 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,25 +1,38 @@
 // 流程管理接口
 import request from '../index'
-const prefix = '/system/label'
 
 // 列表
-export function getLabelList(data: { offset: number; limit: number }) {
+export function getLabelList(params: object) {
   return request({
-    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: '/system/rfid/listPage',
+    method: 'get',
+    params,
+  })
+}
+
+// 删除
+export function delLabel(data: object) {
+  return request({
+    url: '/system/rfid/remove',
     method: 'post',
     data,
   })
 }
 
-// 删除
-export function delLabel(id: string) {
-  const param = {
-    rfid: id,
-  }
+// 导入
+export function importLabel(data: object) {
   return request({
-    url: `${prefix}/delete`,
+    url: '/system/rfid/export',
     method: 'post',
-    data: param,
+    data,
   })
 }
+// 批量导入
 
+export function batchImportLabel(data: object) {
+  return request({
+    url: '/system/rfid/importRfid',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/assets/icons/icon-delete.svg b/src/assets/icons/icon-delete.svg
new file mode 100644
index 0000000..88e4145
--- /dev/null
+++ b/src/assets/icons/icon-delete.svg
@@ -0,0 +1 @@
+<svg t="1693304345270" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4067" width="200" height="200"><path d="M928.16 144H736V64a32 32 0 0 0-32-32H320a32 32 0 0 0-32 32v80H95.84a32 32 0 0 0 0 64H129.6l77.92 698.656A96 96 0 0 0 302.912 992h418.144a96.032 96.032 0 0 0 95.424-85.344L894.4 208h33.728a32 32 0 0 0 0.032-64zM352 96h320v48H352V96z m400.896 803.552a32 32 0 0 1-31.808 28.448H302.912a32 32 0 0 1-31.808-28.448L193.984 208h636.032l-77.12 691.552z" p-id="4068" fill="#3d7eff"></path><path d="M608 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32zM432 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32z" p-id="4069" fill="#3d7eff"></path></svg>
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
new file mode 100644
index 0000000..72d45f9
--- /dev/null
+++ b/src/views/system/expire/edit.vue
@@ -0,0 +1,118 @@
+<script lang="ts" setup name="EditExpire">
+import type { Ref } from 'vue'
+import { nextTick, reactive } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { getList, updateRemind } from '@/api/system/expire'
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+const dialogVisible = ref(false)
+const data = ref({
+  createDeptId: 0,
+  createDeptName: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  id: '',
+  remindName: '',
+  remindTime: 0,
+  updateTime: '',
+})
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 表单提交
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        updateRemind(data.value).then((res) => {
+          ElMessage.success('修改成功')
+          dialogVisible.value = false
+          emits('closeRefresh')
+        })
+      }
+    })
+  }
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: any) {
+  dialogVisible.value = true
+  data.value = row
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  emits('closeRefresh')
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="到期提醒-编辑"
+    width="30%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="dataFormRef" :model="data" label-position="left" label-width="80px" class="form-container"
+      size="default" @submit.prevent
+    >
+      <el-row :gutter="24">
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="提醒名称" prop="tips" class="required">
+            <el-input v-model="data.remindName" type="text" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="提醒时间" prop="tips" class="required">
+            <el-input-number v-model="data.remindTime" controls-position="right" placeholder="到期前xx天" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+  width: 100%;
+
+  .full-width-input {
+    width: 100%;
+  }
+
+  .dict-detail {
+    padding: 10px;
+
+    .title {
+      font-size: 16px;
+      font-weight: bold;
+      margin-bottom: 15px;
+    }
+  }
+}
+</style>
diff --git a/src/views/system/expire/list.vue b/src/views/system/expire/list.vue
index 1b5a366..9a0497e 100644
--- a/src/views/system/expire/list.vue
+++ b/src/views/system/expire/list.vue
@@ -1,17 +1,48 @@
+<!-- 系统管理-到期提醒 -->
 <script lang="ts" setup name="Expire">
+import editDialog from './edit.vue'
+import { getList, updateRemind } from '@/api/system/expire'
 // 表头
 const columns = ref([
-  { text: '提醒名称', value: 'labelId' },
-  { text: '提醒时间', value: 'useState' },
+  { text: '提醒名称', value: 'remindName', align: 'center' },
+  { text: '提醒时间', value: 'remindTime', align: 'center' },
 ])
 const list = ref([])
 const total = ref(20)
 const listLoading = ref(false)
+const listQuery = reactive({
+  limit: 20,
+  offset: 1,
+})
+// 编辑
+const editDialogRef = ref()
+const handleEdit = (row: any) => {
+  editDialogRef.value.initDialog(row)
+}
+// 获取列表
+const fetchData = () => {
+  getList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = Number(res.data.total)
+  })
+}
+fetchData()
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
 </script>
 
 <template>
   <div class="expire">
     <app-container>
+      <edit-dialog ref="editDialogRef" @close-refresh="fetchData" />
       <!-- 查询结果Table显示 -->
       <table-container>
         <div class="table-area">
@@ -34,18 +65,14 @@
               <el-table-column label="操作" width="160" align="center" fixed="right">
                 <template #default="scope">
                   <el-button
-                    v-if="proxy.hasPerm('/sys/expire/edit')"
                     type="primary"
                     link
                     size="small"
                     class="table-text-button"
-                    @click="handleEdit(scope.row, 'edit')"
+                    @click="handleEdit(scope.row)"
                   >
                     编辑
                   </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="handleEdit(scope.row, 'detail')">
-                    详情
-                  </el-button>
                 </template>
               </el-table-column>
             </template>

diff --git a/src/api/system/expire.ts b/src/api/system/expire.ts
new file mode 100644
index 0000000..1365711
--- /dev/null
+++ b/src/api/system/expire.ts
@@ -0,0 +1,20 @@
+/**
+ * 系统管理 - 到期提醒
+ */
+import request from '../index'
+// 列表
+export function getList(params: object) {
+  return request({
+    url: '/system/remind/listPage',
+    method: 'get',
+    params,
+  })
+}
+// 编辑
+export function updateRemind(data: object) {
+  return request({
+    url: '/system/remind/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index 7c040fa..c419845 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,25 +1,38 @@
 // 流程管理接口
 import request from '../index'
-const prefix = '/system/label'
 
 // 列表
-export function getLabelList(data: { offset: number; limit: number }) {
+export function getLabelList(params: object) {
   return request({
-    url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
+    url: '/system/rfid/listPage',
+    method: 'get',
+    params,
+  })
+}
+
+// 删除
+export function delLabel(data: object) {
+  return request({
+    url: '/system/rfid/remove',
     method: 'post',
     data,
   })
 }
 
-// 删除
-export function delLabel(id: string) {
-  const param = {
-    rfid: id,
-  }
+// 导入
+export function importLabel(data: object) {
   return request({
-    url: `${prefix}/delete`,
+    url: '/system/rfid/export',
     method: 'post',
-    data: param,
+    data,
   })
 }
+// 批量导入
 
+export function batchImportLabel(data: object) {
+  return request({
+    url: '/system/rfid/importRfid',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/assets/icons/icon-delete.svg b/src/assets/icons/icon-delete.svg
new file mode 100644
index 0000000..88e4145
--- /dev/null
+++ b/src/assets/icons/icon-delete.svg
@@ -0,0 +1 @@
+<svg t="1693304345270" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4067" width="200" height="200"><path d="M928.16 144H736V64a32 32 0 0 0-32-32H320a32 32 0 0 0-32 32v80H95.84a32 32 0 0 0 0 64H129.6l77.92 698.656A96 96 0 0 0 302.912 992h418.144a96.032 96.032 0 0 0 95.424-85.344L894.4 208h33.728a32 32 0 0 0 0.032-64zM352 96h320v48H352V96z m400.896 803.552a32 32 0 0 1-31.808 28.448H302.912a32 32 0 0 1-31.808-28.448L193.984 208h636.032l-77.12 691.552z" p-id="4068" fill="#3d7eff"></path><path d="M608 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32zM432 820.928a32 32 0 0 0 32-32V319.104a32 32 0 0 0-64 0v469.824a32 32 0 0 0 32 32z" p-id="4069" fill="#3d7eff"></path></svg>
diff --git a/src/views/system/expire/edit.vue b/src/views/system/expire/edit.vue
new file mode 100644
index 0000000..72d45f9
--- /dev/null
+++ b/src/views/system/expire/edit.vue
@@ -0,0 +1,118 @@
+<script lang="ts" setup name="EditExpire">
+import type { Ref } from 'vue'
+import { nextTick, reactive } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
+import { getList, updateRemind } from '@/api/system/expire'
+// ----------------------- 以下是字段定义 emits props ---------------------
+const emits = defineEmits(['closeRefresh'])
+
+const dialogVisible = ref(false)
+const data = ref({
+  createDeptId: 0,
+  createDeptName: '',
+  createTime: '',
+  createUserId: '',
+  createUserName: '',
+  id: '',
+  remindName: '',
+  remindTime: 0,
+  updateTime: '',
+})
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+
+// 表单提交
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        updateRemind(data.value).then((res) => {
+          ElMessage.success('修改成功')
+          dialogVisible.value = false
+          emits('closeRefresh')
+        })
+      }
+    })
+  }
+}
+
+// ----------初始化、关闭对话框相关-----------------
+function initDialog(row: any) {
+  dialogVisible.value = true
+  data.value = row
+}
+
+// 关闭并刷新
+function closeRefresh() {
+  dialogVisible.value = false
+  emits('closeRefresh')
+}
+// 关闭弹窗
+function dialogClose() {
+  dialogVisible.value = false
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="到期提醒-编辑"
+    width="30%"
+    :before-close="dialogClose"
+    append-to-body
+    :open-delay="0"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="dataFormRef" :model="data" label-position="left" label-width="80px" class="form-container"
+      size="default" @submit.prevent
+    >
+      <el-row :gutter="24">
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="提醒名称" prop="tips" class="required">
+            <el-input v-model="data.remindName" type="text" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="grid-cell">
+          <el-form-item label="提醒时间" prop="tips" class="required">
+            <el-input-number v-model="data.remindTime" controls-position="right" placeholder="到期前xx天" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">
+          保存
+        </el-button>
+        <el-button @click="dialogClose">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+  width: 100%;
+
+  .full-width-input {
+    width: 100%;
+  }
+
+  .dict-detail {
+    padding: 10px;
+
+    .title {
+      font-size: 16px;
+      font-weight: bold;
+      margin-bottom: 15px;
+    }
+  }
+}
+</style>
diff --git a/src/views/system/expire/list.vue b/src/views/system/expire/list.vue
index 1b5a366..9a0497e 100644
--- a/src/views/system/expire/list.vue
+++ b/src/views/system/expire/list.vue
@@ -1,17 +1,48 @@
+<!-- 系统管理-到期提醒 -->
 <script lang="ts" setup name="Expire">
+import editDialog from './edit.vue'
+import { getList, updateRemind } from '@/api/system/expire'
 // 表头
 const columns = ref([
-  { text: '提醒名称', value: 'labelId' },
-  { text: '提醒时间', value: 'useState' },
+  { text: '提醒名称', value: 'remindName', align: 'center' },
+  { text: '提醒时间', value: 'remindTime', align: 'center' },
 ])
 const list = ref([])
 const total = ref(20)
 const listLoading = ref(false)
+const listQuery = reactive({
+  limit: 20,
+  offset: 1,
+})
+// 编辑
+const editDialogRef = ref()
+const handleEdit = (row: any) => {
+  editDialogRef.value.initDialog(row)
+}
+// 获取列表
+const fetchData = () => {
+  getList(listQuery).then((res) => {
+    list.value = res.data.rows
+    total.value = Number(res.data.total)
+  })
+}
+fetchData()
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
 </script>
 
 <template>
   <div class="expire">
     <app-container>
+      <edit-dialog ref="editDialogRef" @close-refresh="fetchData" />
       <!-- 查询结果Table显示 -->
       <table-container>
         <div class="table-area">
@@ -34,18 +65,14 @@
               <el-table-column label="操作" width="160" align="center" fixed="right">
                 <template #default="scope">
                   <el-button
-                    v-if="proxy.hasPerm('/sys/expire/edit')"
                     type="primary"
                     link
                     size="small"
                     class="table-text-button"
-                    @click="handleEdit(scope.row, 'edit')"
+                    @click="handleEdit(scope.row)"
                   >
                     编辑
                   </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="handleEdit(scope.row, 'detail')">
-                    详情
-                  </el-button>
                 </template>
               </el-table-column>
             </template>
diff --git a/src/views/system/label/list.vue b/src/views/system/label/list.vue
index d790282..f3e5d8a 100644
--- a/src/views/system/label/list.vue
+++ b/src/views/system/label/list.vue
@@ -9,25 +9,25 @@
 const { proxy } = getCurrentInstance() as any
 const useStateList = ref<IUseStateList[]>([]) // 关联使用情况字典值
 const listQuery = reactive({
-  useState: '', // 使用情况
+  rfid: '',
+  equipmentNo: '',
+  equipmentName: '',
+  useStatus: '', // 使用情况
   offset: 1,
   limit: 20,
 })
 const fileRef = ref() // 文件上传input，获取input的引用
 // 表头
 const columns = ref([
-  { text: 'RFID标签编号', value: 'rfid', width: '200' },
-  { text: '使用情况', value: 'status', width: '100' },
-  { text: '绑定设备编号', value: 'equipmentNo', width: '300' },
-  { text: '绑定设备名称', value: 'equipmentName', width: '300' },
-  { text: '使用岗位', value: 'equipmentDeptName' },
-  { text: '负责人', value: 'equipmentDirectorName', width: '150' },
+  { text: 'RFID标签编号', value: 'rfid', width: '200', align: 'center' },
+  { text: '使用情况', value: 'usageStatusName', width: '100', align: 'center' },
+  { text: '绑定设备编号', value: 'equipmentNo', width: '300', align: 'center' },
+  { text: '绑定设备名称', value: 'equipmentName', width: '300', align: 'center' },
+  { text: '使用岗位', value: 'usePosition', align: 'center' },
+  { text: '负责人', value: 'directorName', width: '150', align: 'center' },
 ])
-const list = ref([
-  { rfid: '12341234', status: '未使用' },
-  { rfid: '11267643211', status: '已使用', equipmentNo: '312020020007', equipmentName: '压力监测仪', equipmentDeptName: '十二室', equipmentDirectorName: '智慧计量' },
-])
-const total = ref(20)
+const list = ref([])
+const total = ref(0)
 const listLoading = ref(false)
 
 // 获取标签使用情况字典值
@@ -36,7 +36,12 @@
     useStateList.value = res.data
   })
 }
-
+// 表格被选中的行
+const selectList = ref<any[]>([])
+// 表格多选
+const multiSelect = (row: any[]) => {
+  selectList.value = row
+}
 // 获取流程列表
 const fetchData = async (isNowPage: boolean) => {
   listLoading.value = true
@@ -44,23 +49,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.offset = 1
   }
-  const param = {
-    useState: '', // 使用状态
-    offset: listQuery.offset,
-    limit: listQuery.limit,
-  }
-  const response = await getLabelList(param)
+  const response = await getLabelList(listQuery)
   total.value = parseInt(response.data.total)
-  list.value = response.data.rows.map((item: any) => {
-    return {
-      ...item,
-      rfid: item.rfid,
-      status: item.useState === 1 ? '已使用' : '未使用',
-      equipmentNo: item.equipmentNo,
-      equipmentName: item.equipmentName,
-      describe: item.formDesc,
-    }
-  })
+  list.value = response.data.rows
+  console.log(list.value, '546564456')
   listLoading.value = false
 }
 
@@ -82,14 +74,15 @@
 
 // 重置
 const reset = () => {
-  listQuery.useState = '' // 使用情况
+  listQuery.rfid = ''
+  listQuery.equipmentNo = ''
+  listQuery.equipmentName = ''
+  listQuery.useStatus = ''
+  listQuery.limit = 20
+  listQuery.offset = 1
   fetchData(true)
 }
 
-// 点击导入
-const upload = () => {
-  fileRef.value.click()
-}
 const onFileChange = (event: any) => {
   // 原生上传
   // console.log(event.target.files)
@@ -127,7 +120,7 @@
     },
   )
     .then(() => {
-      delLabel(row.rfid).then((res) => {
+      delLabel({ rfids: [row.rfid] }).then((res) => {
         if (res.code === 200) {
           ElMessage.success('删除成功')
           fetchData(true)
@@ -135,9 +128,21 @@
       })
     })
 }
+// 导入
+const ImportFile = () => {
+  fileRef.value.click()
+}
+// 导出
+const exportFile = () => {
 
+}
+// 批量删除
+const batchDeleteLabel = () => {
+
+}
 onMounted(() => {
   fetchLabelUseDict()
+  fetchData(true)
 })
 </script>
 
@@ -147,7 +152,16 @@
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-select v-model="listQuery.useState" placeholder="请选择使用情况" clearable>
+          <el-input v-model="listQuery.rfid" placeholder="rfid标签编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model="listQuery.equipmentNo" placeholder="绑定设备编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model="listQuery.equipmentName" placeholder="绑定设备名称" clearable />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.useStatus" placeholder="请选择使用情况" clearable>
             <el-option
               v-for="item in useStateList"
               :key="item.id"
@@ -161,8 +175,10 @@
       <!-- 查询结果Table显示 -->
       <table-container>
         <template #btns-right>
-          <icon-button ref="fileRef" icon="icon-import" title="导入" type="primary" @click="upload" />
-          <input v-show="false" ref="fileRef" type="file" accept=".xls,.xlsx" @change="onFileChange">
+          <icon-button icon="icon-import" title="导入" type="primary" @click="ImportFile" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportFile" />
+          <icon-button icon="icon-delete" title="删除" type="primary" @click="batchDeleteLabel" />
+          <input ref="fileRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
         </template>
 
         <div class="table-area">
@@ -173,6 +189,7 @@
             :query="listQuery"
             :list-loading="listLoading"
             @change="changePage"
+            @multiSelect="multiSelect"
           >
             <template #preColumns>
               <el-table-column label="序号" width="55" align="center">