diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"

diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }

diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数

diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..0c5f918 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="7" />
   </app-container>
 </template>
 

diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..0c5f918 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="7" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 

diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..0c5f918 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="7" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 

diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..0c5f918 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="7" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 

diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..0c5f918 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="7" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 

diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..0c5f918 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="7" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 0fdec28..e56f293 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -12,7 +12,7 @@
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
-  userIdList: [], // 可使用人列表
+  // userIdList: [], // 可使用人列表
   templateType: '', // 类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
@@ -24,18 +24,19 @@
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
-  userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
+  // userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const userList = ref<userType[]>([]) // 可使用人列表
-const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
-  })
-} // 获取可使用人列表
+// const userList = ref<userType[]>([]) // 可使用人列表
+// const getuser = () => {
+//   getUserList({ offset: 1, limit: 99999 }).then((res) => {
+//     userList.value = res.data.rows
+//   })
+// }
+// 获取可使用人列表
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,7 +45,7 @@
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
   ruleForm.minioFileName = ''
-  ruleForm.userIdList = []
+  // ruleForm.userIdList = []
   ruleForm.templateCreator = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
@@ -61,16 +62,16 @@
     // ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
       ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
+      // res.data.userList.forEach((element: userType) => {
+      //   ruleForm.userIdList?.push(element.id)
+      // })
     })
     // 修改
   }
@@ -81,14 +82,14 @@
     ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
-    templatePageDetail({ ...row }).then((res) => {
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // templatePageDetail({ ...row }).then((res) => {
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   ruleForm.templateType = row.templateType
   getuser()
@@ -184,11 +185,11 @@
       <el-form-item label="模板描述" prop="templateDesc">
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
-      <el-form-item label="可使用人" prop="userIdList">
+      <!-- <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> -->
       <!-- <el-form-item label="发布内容" prop="noticeContent">
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->

diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..0c5f918 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="7" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 0fdec28..e56f293 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -12,7 +12,7 @@
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
-  userIdList: [], // 可使用人列表
+  // userIdList: [], // 可使用人列表
   templateType: '', // 类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
@@ -24,18 +24,19 @@
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
-  userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
+  // userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const userList = ref<userType[]>([]) // 可使用人列表
-const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
-  })
-} // 获取可使用人列表
+// const userList = ref<userType[]>([]) // 可使用人列表
+// const getuser = () => {
+//   getUserList({ offset: 1, limit: 99999 }).then((res) => {
+//     userList.value = res.data.rows
+//   })
+// }
+// 获取可使用人列表
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,7 +45,7 @@
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
   ruleForm.minioFileName = ''
-  ruleForm.userIdList = []
+  // ruleForm.userIdList = []
   ruleForm.templateCreator = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
@@ -61,16 +62,16 @@
     // ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
       ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
+      // res.data.userList.forEach((element: userType) => {
+      //   ruleForm.userIdList?.push(element.id)
+      // })
     })
     // 修改
   }
@@ -81,14 +82,14 @@
     ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
-    templatePageDetail({ ...row }).then((res) => {
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // templatePageDetail({ ...row }).then((res) => {
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   ruleForm.templateType = row.templateType
   getuser()
@@ -184,11 +185,11 @@
       <el-form-item label="模板描述" prop="templateDesc">
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
-      <el-form-item label="可使用人" prop="userIdList">
+      <!-- <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> -->
       <!-- <el-form-item label="发布内容" prop="noticeContent">
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index d5d28d8..cf7dec3 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -12,7 +12,7 @@
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
-  userIdList: [], // 可使用人列表
+  // userIdList: [], // 可使用人列表
   templateType: '', // 类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
@@ -24,17 +24,17 @@
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
-  userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
+  // userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const userList = ref<userType[]>([]) // 可使用人列表
+// const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
-  })
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
 } // 获取可使用人列表
 // 弹窗初始化
 const initDialog = (row: templateType) => {
@@ -44,7 +44,7 @@
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
   ruleForm.minioFileName = ''
-  ruleForm.userIdList = []
+  // ruleForm.userIdList = []
   ruleForm.templateCreator = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
@@ -61,17 +61,17 @@
     // ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ ...row }).then((res) => {
-      ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // templatePageDetail({ ...row }).then((res) => {
+    //   ruleForm.id = res.data.id
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
     // 修改
   }
   else {
@@ -81,15 +81,15 @@
     ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
-    templatePageDetail({ ...row }).then((res) => {
-      // ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // templatePageDetail({ ...row }).then((res) => {
+    //   ruleForm.id = res.data.id
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   ruleForm.templateType = row.templateType
   getuser()
@@ -185,11 +185,11 @@
       <el-form-item label="模板描述" prop="templateDesc">
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
-      <el-form-item label="可使用人" prop="userIdList">
+      <!-- <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> -->
       <!-- <el-form-item label="发布内容" prop="noticeContent">
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->