diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}

diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).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 }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // 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()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"

diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).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 }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // 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()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // if (event.target.files[0].type === 'application/pdf') {
   if (event.target.files?.length !== 0) {
     // 创建formdata对象
     const fd = new FormData()
     fd.append('multipartFile', event.target.files[0])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index ef78067..0f594af 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -48,9 +48,6 @@
   ruleForm.signDirector = ''
   ruleForm.id = ''
   dialogVisible.value = true
-  // ruleForm.noticePublisher = userInfo.$state.name
-  // ruleForm.noticeCompany = userInfo.$state.deptName
-  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
   if (row.title === '新增') {
     // 新增
     ruleFormRef.value?.resetFields()
@@ -158,46 +155,11 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container" @close="resetForm">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
-      <!-- <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="签名编号" prop="signNo">
-            <el-input v-model.trim="ruleForm.signNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="签名名称" prop="signName">
-            <el-input v-model.trim="ruleForm.signName" placeholder="签名名称" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="创建时间" prop="noticeCompany">
-            <el-input v-model.trim="ruleForm.createTime" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="签名负责人" prop="signDirector">
-            <el-input v-model.trim="ruleForm.signDirector" placeholder="签名负责人" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="签名描述" prop="signDesc">
-        <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
-      </el-form-item>
-      <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
-          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="签名人员" prop="userIdList">
         <el-select v-model="ruleForm.userIdList" filterable :placeholder="title === '详情' ? '暂无签名人员' : '请选择签名人员'" :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
-      </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" width="100%" height="125px" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">