diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index a58b89e..ec522cf 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -16,6 +16,7 @@
 import { addStatus, detailStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+
 const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
@@ -24,6 +25,9 @@
 const title = ref('')
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
+interface EquipmentListRow {
+  equipmentId: string
+}
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
@@ -37,7 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
-  equipmentList: [],
+  equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -206,6 +210,10 @@
     if ($route.query.title !== '新建') {
       detailStatus({ id: $route.params.id }).then((res) => {
         ruleForm1.value = res.data
+        ruleForm1.value.applyUnit = res.data.applyUnit
+        ruleForm1.value.equipmentNo = res.data.applyNo
+        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.time = res.data.time
       })
     }
   }
@@ -520,6 +528,10 @@
       ruleForm1.value.manufacturingNo = device.manufacturingNo
       ruleForm1.value.manufacturer = device.manufacturer
       ruleFormRef1.value.clearValidate('equipmentNo')
+      // 赋值
+      ruleForm1.value.equipmentList = [{
+        equipmentId: row[0].id,
+      }]
     }
   }
   // row.forEach((element) => {
@@ -603,6 +615,7 @@
           关闭
         </el-button>
       </template>
+      <!-- 状态管理 -->
       <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -660,7 +673,7 @@
           <el-col :span="6">
             <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 === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />

diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index a58b89e..ec522cf 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -16,6 +16,7 @@
 import { addStatus, detailStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+
 const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
@@ -24,6 +25,9 @@
 const title = ref('')
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
+interface EquipmentListRow {
+  equipmentId: string
+}
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
@@ -37,7 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
-  equipmentList: [],
+  equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -206,6 +210,10 @@
     if ($route.query.title !== '新建') {
       detailStatus({ id: $route.params.id }).then((res) => {
         ruleForm1.value = res.data
+        ruleForm1.value.applyUnit = res.data.applyUnit
+        ruleForm1.value.equipmentNo = res.data.applyNo
+        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.time = res.data.time
       })
     }
   }
@@ -520,6 +528,10 @@
       ruleForm1.value.manufacturingNo = device.manufacturingNo
       ruleForm1.value.manufacturer = device.manufacturer
       ruleFormRef1.value.clearValidate('equipmentNo')
+      // 赋值
+      ruleForm1.value.equipmentList = [{
+        equipmentId: row[0].id,
+      }]
     }
   }
   // row.forEach((element) => {
@@ -603,6 +615,7 @@
           关闭
         </el-button>
       </template>
+      <!-- 状态管理 -->
       <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -660,7 +673,7 @@
           <el-col :span="6">
             <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 === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0bdbd3a..1cc56b2 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -7,6 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 
 const props = defineProps({
   name: {
@@ -26,6 +27,13 @@
     default: '',
   },
 })
+const formIdList = ref({
+  设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
+  设备封存申请: 'DEVICE_SEALED_APPROVAL',
+  设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
+  设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
+  设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+})
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
@@ -39,6 +47,7 @@
   limit: 20,
   offset: 1,
   applyType: props.applyType, // 申请类型
+  formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数

diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index a58b89e..ec522cf 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -16,6 +16,7 @@
 import { addStatus, detailStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+
 const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
@@ -24,6 +25,9 @@
 const title = ref('')
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
+interface EquipmentListRow {
+  equipmentId: string
+}
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
@@ -37,7 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
-  equipmentList: [],
+  equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -206,6 +210,10 @@
     if ($route.query.title !== '新建') {
       detailStatus({ id: $route.params.id }).then((res) => {
         ruleForm1.value = res.data
+        ruleForm1.value.applyUnit = res.data.applyUnit
+        ruleForm1.value.equipmentNo = res.data.applyNo
+        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.time = res.data.time
       })
     }
   }
@@ -520,6 +528,10 @@
       ruleForm1.value.manufacturingNo = device.manufacturingNo
       ruleForm1.value.manufacturer = device.manufacturer
       ruleFormRef1.value.clearValidate('equipmentNo')
+      // 赋值
+      ruleForm1.value.equipmentList = [{
+        equipmentId: row[0].id,
+      }]
     }
   }
   // row.forEach((element) => {
@@ -603,6 +615,7 @@
           关闭
         </el-button>
       </template>
+      <!-- 状态管理 -->
       <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -660,7 +673,7 @@
           <el-col :span="6">
             <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 === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0bdbd3a..1cc56b2 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -7,6 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 
 const props = defineProps({
   name: {
@@ -26,6 +27,13 @@
     default: '',
   },
 })
+const formIdList = ref({
+  设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
+  设备封存申请: 'DEVICE_SEALED_APPROVAL',
+  设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
+  设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
+  设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+})
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
@@ -39,6 +47,7 @@
   limit: 20,
   offset: 1,
   applyType: props.applyType, // 申请类型
+  formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index 0f594af..eca5e7f 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -21,6 +21,7 @@
   signNo: '',
   createTime: '',
   id: '',
+  signUserId: '', // 可使用人id
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
@@ -28,6 +29,7 @@
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
+  signUserId: [{ required: true, message: '签名人员不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -53,24 +55,24 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
+  // 修改
   else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
-    // ruleForm.createTime = row.createTime
     ruleForm.signDesc = row.signDesc
     ruleForm.minioFileName = row.minioFileName
     ruleForm.userIdList = row.userIdList
     ruleForm.signDirector = row.signDirector
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    ruleForm.signUserId = row.signUserId
     // 获取详情列表
-    listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
-    // 修改
+    // listPageDetailApi({ ...row }).then((res) => {
+    //   ruleForm.id = res.data.id
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   else {
     // 详情
@@ -81,12 +83,13 @@
     ruleForm.minioFileName = row.minioFileName
     ruleForm.userIdList = row.userIdList
     ruleForm.signDirector = row.signDirector
+    ruleForm.signUserId = row.signUserId
     // 获取详情列表
-    listPageDetailApi({ ...row }).then((res) => {
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // listPageDetailApi({ ...row }).then((res) => {
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   ruleForm.signType = row.signType
   getuser()
@@ -103,6 +106,14 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        userList.value.map((item) => {
+          if (item.id === ruleForm.signUserId) {
+            // 后台去掉校验去除赋值操作
+            ruleForm.signDirector = item.name
+            ruleForm.signName = item.name
+            ruleForm.userIdList = [ruleForm.signUserId]
+          }
+        })
         addApi(ruleForm).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
@@ -111,6 +122,14 @@
         })
       }
       else {
+        userList.value.map((item) => {
+          if (item.id === ruleForm.signUserId) {
+            // 后台去掉校验去除赋值操作
+            ruleForm.signDirector = item.name
+            ruleForm.signName = item.name
+            ruleForm.userIdList = [ruleForm.signUserId]
+          }
+        })
         updateApi(ruleForm).then((res) => {
           if (res.code === 200) {
             ElMessage.success('更新成功')
@@ -155,8 +174,8 @@
 <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-form-item label="签名人员" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" filterable :placeholder="title === '详情' ? '暂无签名人员' : '请选择签名人员'" :disabled="title === '详情'" style="width: 100%;">
+      <el-form-item label="签名人员" prop="signUserId">
+        <el-select v-model="ruleForm.signUserId" 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>

diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index a58b89e..ec522cf 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -16,6 +16,7 @@
 import { addStatus, detailStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+
 const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
@@ -24,6 +25,9 @@
 const title = ref('')
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
+interface EquipmentListRow {
+  equipmentId: string
+}
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
@@ -37,7 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
-  equipmentList: [],
+  equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -206,6 +210,10 @@
     if ($route.query.title !== '新建') {
       detailStatus({ id: $route.params.id }).then((res) => {
         ruleForm1.value = res.data
+        ruleForm1.value.applyUnit = res.data.applyUnit
+        ruleForm1.value.equipmentNo = res.data.applyNo
+        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.time = res.data.time
       })
     }
   }
@@ -520,6 +528,10 @@
       ruleForm1.value.manufacturingNo = device.manufacturingNo
       ruleForm1.value.manufacturer = device.manufacturer
       ruleFormRef1.value.clearValidate('equipmentNo')
+      // 赋值
+      ruleForm1.value.equipmentList = [{
+        equipmentId: row[0].id,
+      }]
     }
   }
   // row.forEach((element) => {
@@ -603,6 +615,7 @@
           关闭
         </el-button>
       </template>
+      <!-- 状态管理 -->
       <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -660,7 +673,7 @@
           <el-col :span="6">
             <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 === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0bdbd3a..1cc56b2 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -7,6 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 
 const props = defineProps({
   name: {
@@ -26,6 +27,13 @@
     default: '',
   },
 })
+const formIdList = ref({
+  设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
+  设备封存申请: 'DEVICE_SEALED_APPROVAL',
+  设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
+  设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
+  设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+})
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
@@ -39,6 +47,7 @@
   limit: 20,
   offset: 1,
   applyType: props.applyType, // 申请类型
+  formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index 0f594af..eca5e7f 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -21,6 +21,7 @@
   signNo: '',
   createTime: '',
   id: '',
+  signUserId: '', // 可使用人id
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
@@ -28,6 +29,7 @@
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
+  signUserId: [{ required: true, message: '签名人员不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -53,24 +55,24 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
+  // 修改
   else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
-    // ruleForm.createTime = row.createTime
     ruleForm.signDesc = row.signDesc
     ruleForm.minioFileName = row.minioFileName
     ruleForm.userIdList = row.userIdList
     ruleForm.signDirector = row.signDirector
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    ruleForm.signUserId = row.signUserId
     // 获取详情列表
-    listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
-    // 修改
+    // listPageDetailApi({ ...row }).then((res) => {
+    //   ruleForm.id = res.data.id
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   else {
     // 详情
@@ -81,12 +83,13 @@
     ruleForm.minioFileName = row.minioFileName
     ruleForm.userIdList = row.userIdList
     ruleForm.signDirector = row.signDirector
+    ruleForm.signUserId = row.signUserId
     // 获取详情列表
-    listPageDetailApi({ ...row }).then((res) => {
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // listPageDetailApi({ ...row }).then((res) => {
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   ruleForm.signType = row.signType
   getuser()
@@ -103,6 +106,14 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        userList.value.map((item) => {
+          if (item.id === ruleForm.signUserId) {
+            // 后台去掉校验去除赋值操作
+            ruleForm.signDirector = item.name
+            ruleForm.signName = item.name
+            ruleForm.userIdList = [ruleForm.signUserId]
+          }
+        })
         addApi(ruleForm).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
@@ -111,6 +122,14 @@
         })
       }
       else {
+        userList.value.map((item) => {
+          if (item.id === ruleForm.signUserId) {
+            // 后台去掉校验去除赋值操作
+            ruleForm.signDirector = item.name
+            ruleForm.signName = item.name
+            ruleForm.userIdList = [ruleForm.signUserId]
+          }
+        })
         updateApi(ruleForm).then((res) => {
           if (res.code === 200) {
             ElMessage.success('更新成功')
@@ -155,8 +174,8 @@
 <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-form-item label="签名人员" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" filterable :placeholder="title === '详情' ? '暂无签名人员' : '请选择签名人员'" :disabled="title === '详情'" style="width: 100%;">
+      <el-form-item label="签名人员" prop="signUserId">
+        <el-select v-model="ruleForm.signUserId" 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>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 870d01d..bf66ef7 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -35,13 +35,20 @@
 })
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
+// const columns = ref([
+//   { text: '签名编号', value: 'signNo', align: 'center', width: '180' },
+//   { text: '签名名称', value: 'signName', align: 'center', width: '150' },
+//   { text: '签名负责人', value: 'signDirector', align: 'center', width: '100' },
+//   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+//   { text: '描述', value: 'signDesc', align: 'center' },
+// ])
 const columns = ref([
-  { text: '签名编号', value: 'signNo', align: 'center', width: '180' },
-  { text: '签名名称', value: 'signName', align: 'center', width: '150' },
-  { text: '签名负责人', value: 'signDirector', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
-]) // 表格
+  { text: '签名人员', value: 'signName', align: 'center', width: '180' },
+  { text: '所在组织机构', value: '', align: 'center' },
+  { text: '签名创建时间', value: 'createTime', align: 'center', width: '250' },
+])
+
+// 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 // 获取类型

diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index a58b89e..ec522cf 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -16,6 +16,7 @@
 import { addStatus, detailStatus } from '@/api/device/stateManage'
 import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
 import useUserStore from '@/store/modules/user'
+
 const userInfo = useUserStore()
 const $router = useRouter()
 const $route = useRoute()
@@ -24,6 +25,9 @@
 const title = ref('')
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
+interface EquipmentListRow {
+  equipmentId: string
+}
 const ruleForm1 = ref({
   applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
@@ -37,7 +41,7 @@
   equipmentSpecifications: '', // 设备规格
   manufacturingNo: '', // 出厂编号
   manufacturer: '', // 生产厂家
-  equipmentList: [],
+  equipmentList: [] as EquipmentListRow[],
   id: '',
 }) // 表单
 const ruleForm2 = ref({
@@ -206,6 +210,10 @@
     if ($route.query.title !== '新建') {
       detailStatus({ id: $route.params.id }).then((res) => {
         ruleForm1.value = res.data
+        ruleForm1.value.applyUnit = res.data.applyUnit
+        ruleForm1.value.equipmentNo = res.data.applyNo
+        ruleForm1.value.equipmentName = res.data.applyTypeName
+        ruleForm1.value.time = res.data.time
       })
     }
   }
@@ -520,6 +528,10 @@
       ruleForm1.value.manufacturingNo = device.manufacturingNo
       ruleForm1.value.manufacturer = device.manufacturer
       ruleFormRef1.value.clearValidate('equipmentNo')
+      // 赋值
+      ruleForm1.value.equipmentList = [{
+        equipmentId: row[0].id,
+      }]
     }
   }
   // row.forEach((element) => {
@@ -603,6 +615,7 @@
           关闭
         </el-button>
       </template>
+      <!-- 状态管理 -->
       <el-form v-if="!isDevice" ref="ruleFormRef1" :model="ruleForm1" :rules="rules1" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
@@ -660,7 +673,7 @@
           <el-col :span="6">
             <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 === '详情'"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
                 :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
                 style="width: 100%;"
               />
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0bdbd3a..1cc56b2 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -7,6 +7,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 
 const props = defineProps({
   name: {
@@ -26,6 +27,13 @@
     default: '',
   },
 })
+const formIdList = ref({
+  设备闲置申请: 'DEVICE_UNUSED_APPROVAL',
+  设备封存申请: 'DEVICE_SEALED_APPROVAL',
+  设备启封申请: 'DEVICE_UNSEALED_APPROVAL',
+  设备报废申请: 'DEVICE_SCRAPPED_ROVAL',
+  设备处置申请: 'DEVICE_HANDLE_APPROVAL',
+})
 const $router = useRouter()
 const searchQuery = reactive({
   applyNo: '', // 申请编号
@@ -39,6 +47,7 @@
   limit: 20,
   offset: 1,
   applyType: props.applyType, // 申请类型
+  formId: SCHEDULE[formIdList.value[props.name]],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index 0f594af..eca5e7f 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -21,6 +21,7 @@
   signNo: '',
   createTime: '',
   id: '',
+  signUserId: '', // 可使用人id
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
@@ -28,6 +29,7 @@
   signName: [{ required: true, message: '签名名称不能为空', trigger: 'blur' }],
   signDirector: [{ required: true, message: '签名负责人不能为空', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
+  signUserId: [{ required: true, message: '签名人员不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
 const userList = ref<userType[]>([]) // 可使用人列表
@@ -53,24 +55,24 @@
     ruleFormRef.value?.resetFields()
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
   }
+  // 修改
   else if (row.title === '编辑') {
     ruleForm.signNo = row.signNo
     ruleForm.signName = row.signName
-    // ruleForm.createTime = row.createTime
     ruleForm.signDesc = row.signDesc
     ruleForm.minioFileName = row.minioFileName
     ruleForm.userIdList = row.userIdList
     ruleForm.signDirector = row.signDirector
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    ruleForm.signUserId = row.signUserId
     // 获取详情列表
-    listPageDetailApi({ ...row }).then((res) => {
-      ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
-    // 修改
+    // listPageDetailApi({ ...row }).then((res) => {
+    //   ruleForm.id = res.data.id
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   else {
     // 详情
@@ -81,12 +83,13 @@
     ruleForm.minioFileName = row.minioFileName
     ruleForm.userIdList = row.userIdList
     ruleForm.signDirector = row.signDirector
+    ruleForm.signUserId = row.signUserId
     // 获取详情列表
-    listPageDetailApi({ ...row }).then((res) => {
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // listPageDetailApi({ ...row }).then((res) => {
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   ruleForm.signType = row.signType
   getuser()
@@ -103,6 +106,14 @@
   await formEl.validate((valid, fields) => {
     if (valid) {
       if (title.value === '新增') {
+        userList.value.map((item) => {
+          if (item.id === ruleForm.signUserId) {
+            // 后台去掉校验去除赋值操作
+            ruleForm.signDirector = item.name
+            ruleForm.signName = item.name
+            ruleForm.userIdList = [ruleForm.signUserId]
+          }
+        })
         addApi(ruleForm).then((res) => {
           if (res.code === 200) {
             ElMessage.success('新增成功')
@@ -111,6 +122,14 @@
         })
       }
       else {
+        userList.value.map((item) => {
+          if (item.id === ruleForm.signUserId) {
+            // 后台去掉校验去除赋值操作
+            ruleForm.signDirector = item.name
+            ruleForm.signName = item.name
+            ruleForm.userIdList = [ruleForm.signUserId]
+          }
+        })
         updateApi(ruleForm).then((res) => {
           if (res.code === 200) {
             ElMessage.success('更新成功')
@@ -155,8 +174,8 @@
 <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-form-item label="签名人员" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" filterable :placeholder="title === '详情' ? '暂无签名人员' : '请选择签名人员'" :disabled="title === '详情'" style="width: 100%;">
+      <el-form-item label="签名人员" prop="signUserId">
+        <el-select v-model="ruleForm.signUserId" 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>
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 870d01d..bf66ef7 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -35,13 +35,20 @@
 })
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
+// const columns = ref([
+//   { text: '签名编号', value: 'signNo', align: 'center', width: '180' },
+//   { text: '签名名称', value: 'signName', align: 'center', width: '150' },
+//   { text: '签名负责人', value: 'signDirector', align: 'center', width: '100' },
+//   { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+//   { text: '描述', value: 'signDesc', align: 'center' },
+// ])
 const columns = ref([
-  { text: '签名编号', value: 'signNo', align: 'center', width: '180' },
-  { text: '签名名称', value: 'signName', align: 'center', width: '150' },
-  { text: '签名负责人', value: 'signDirector', align: 'center', width: '100' },
-  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
-  { text: '描述', value: 'signDesc', align: 'center' },
-]) // 表格
+  { text: '签名人员', value: 'signName', align: 'center', width: '180' },
+  { text: '所在组织机构', value: '', align: 'center' },
+  { text: '签名创建时间', value: 'createTime', align: 'center', width: '250' },
+])
+
+// 表格
 const list = ref([]) // 表格数据
 const addRef = ref() // 添加/编辑/详情/组件
 // 获取类型
diff --git a/src/views/system/tool/tool_interface.ts b/src/views/system/tool/tool_interface.ts
index b682db8..be4872a 100644
--- a/src/views/system/tool/tool_interface.ts
+++ b/src/views/system/tool/tool_interface.ts
@@ -31,6 +31,7 @@
   updateTime?: string
   userIdList: string[]
   title?: string
+  signUserId: string
 }
 // 模板列表类型
 export interface templateType {