diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index e060a8b..2421142 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/train/plan/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
 
 }

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index e060a8b..2421142 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/train/plan/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
 
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 7fdfe4f..577779f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,15 @@
-<script setup>
+<script setup lang="ts" name="ProcessSetting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
-import promoterDrawer from '@/components/drawer/promoterDrawer.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
 import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
 import userStore from '@/store/modules/user'
+import type { ITipList } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -25,19 +25,20 @@
     default: false,
   },
 })
+const emits = defineEmits(['createProcessSuccess'])
+const processConfig = ref({}) as any
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
 const router = useRouter()
-const tipList = ref([]) // 统计空节点的数组
+const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
-const processConfig = ref({})
 const nodeConfig = ref({})
 const workFlowDef = ref({})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
-const initDetail = async (formid) => {
+const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
 }
@@ -51,7 +52,7 @@
   const route = useRoute()
   nextTick(async () => {
     let data
-    if (!props.isAddProcess) { // 非新建流程--调流程详情接口
+    if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -83,8 +84,8 @@
     processConfig.value = data
     const {
       nodeConfig: nodes,
-      flowPermission: flows,
-      directorMaxLevel: directors,
+      flowPermission: flows, // 发起人
+      // directorMaxLevel: directors,
       workFlowDef: works,
       tableId,
     } = data
@@ -98,7 +99,7 @@
 })
 
 // 统计空节点（红色感叹号）
-const reErr = ({ childNode }) => {
+const reErr = ({ childNode }: any) => {
   if (childNode) {
     const { type, error, nodeName, conditionNodes } = childNode
     if (type == 1 || type == 2) {
@@ -128,10 +129,7 @@
   }
 }
 
-const toReturn = () => {
-  // window.location.href = ""
-}
-
+// 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
     processConfig.value.formId = props.getRowData.formId
@@ -157,7 +155,7 @@
   if (tipList.value.length != 0) { // 存在空节点
     let approverCount = 0
     let conditonCount = 0
-    tipList.value.forEach((item) => {
+    tipList.value.forEach((item: { type: string }) => {
       if (item.type === '审核人') {
         approverCount += 1
       }
@@ -193,6 +191,7 @@
     const res = await addProcess(processConfig.value)
     if (res.code == 200) {
       ElMessage.success('创建流程成功')
+      emits('createProcessSuccess')
     }
   }
   loading.close()
@@ -201,7 +200,7 @@
   saveSet, initDetail,
 })
 
-const zoomSize = (type) => {
+const zoomSize = (type: number) => {
   if (type == 1) {
     if (nowVal.value == 50) {
       return
@@ -217,34 +216,13 @@
 }
 
 // 改变空节点错误对话框显隐
-const changeTipVisible = (val) => {
+const changeTipVisible = (val: boolean) => {
   tipVisible.value = false
 }
 </script>
 
 <template>
   <div class="workFlow-setting">
-    <!-- <div class="fd-nav">
-      <div class="fd-nav-left">
-        <div class="fd-nav-back" @click="toReturn">
-          <i class="anticon anticon-left" />
-        </div>
-        <div class="fd-nav-title">
-          {{ workFlowDef.name }}
-        </div>
-      </div>
-      <div class="fd-nav-right">
-        <button type="button" class="ant-btn button-publish" @click="saveSet">
-          <span>发 布</span>
-        </button>
-      </div>
-    </div> -->
-    <!-- <div class="close-button">
-      <el-button type="primary" @click="closeSetting">
-        关 闭
-      </el-button>
-    </div> -->
-    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -269,7 +247,6 @@
       </section>
     </div>
     <error-dialog v-model:visible="tipVisible" :list="tipList" @changeTipVisible="changeTipVisible" />
-    <promoter-drawer />
     <approver-drawer :director-max-level="directorMaxLevel" />
     <copyer-drawer />
     <condition-drawer />

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index e060a8b..2421142 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/train/plan/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
 
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 7fdfe4f..577779f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,15 @@
-<script setup>
+<script setup lang="ts" name="ProcessSetting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
-import promoterDrawer from '@/components/drawer/promoterDrawer.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
 import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
 import userStore from '@/store/modules/user'
+import type { ITipList } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -25,19 +25,20 @@
     default: false,
   },
 })
+const emits = defineEmits(['createProcessSuccess'])
+const processConfig = ref({}) as any
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
 const router = useRouter()
-const tipList = ref([]) // 统计空节点的数组
+const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
-const processConfig = ref({})
 const nodeConfig = ref({})
 const workFlowDef = ref({})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
-const initDetail = async (formid) => {
+const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
 }
@@ -51,7 +52,7 @@
   const route = useRoute()
   nextTick(async () => {
     let data
-    if (!props.isAddProcess) { // 非新建流程--调流程详情接口
+    if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -83,8 +84,8 @@
     processConfig.value = data
     const {
       nodeConfig: nodes,
-      flowPermission: flows,
-      directorMaxLevel: directors,
+      flowPermission: flows, // 发起人
+      // directorMaxLevel: directors,
       workFlowDef: works,
       tableId,
     } = data
@@ -98,7 +99,7 @@
 })
 
 // 统计空节点（红色感叹号）
-const reErr = ({ childNode }) => {
+const reErr = ({ childNode }: any) => {
   if (childNode) {
     const { type, error, nodeName, conditionNodes } = childNode
     if (type == 1 || type == 2) {
@@ -128,10 +129,7 @@
   }
 }
 
-const toReturn = () => {
-  // window.location.href = ""
-}
-
+// 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
     processConfig.value.formId = props.getRowData.formId
@@ -157,7 +155,7 @@
   if (tipList.value.length != 0) { // 存在空节点
     let approverCount = 0
     let conditonCount = 0
-    tipList.value.forEach((item) => {
+    tipList.value.forEach((item: { type: string }) => {
       if (item.type === '审核人') {
         approverCount += 1
       }
@@ -193,6 +191,7 @@
     const res = await addProcess(processConfig.value)
     if (res.code == 200) {
       ElMessage.success('创建流程成功')
+      emits('createProcessSuccess')
     }
   }
   loading.close()
@@ -201,7 +200,7 @@
   saveSet, initDetail,
 })
 
-const zoomSize = (type) => {
+const zoomSize = (type: number) => {
   if (type == 1) {
     if (nowVal.value == 50) {
       return
@@ -217,34 +216,13 @@
 }
 
 // 改变空节点错误对话框显隐
-const changeTipVisible = (val) => {
+const changeTipVisible = (val: boolean) => {
   tipVisible.value = false
 }
 </script>
 
 <template>
   <div class="workFlow-setting">
-    <!-- <div class="fd-nav">
-      <div class="fd-nav-left">
-        <div class="fd-nav-back" @click="toReturn">
-          <i class="anticon anticon-left" />
-        </div>
-        <div class="fd-nav-title">
-          {{ workFlowDef.name }}
-        </div>
-      </div>
-      <div class="fd-nav-right">
-        <button type="button" class="ant-btn button-publish" @click="saveSet">
-          <span>发 布</span>
-        </button>
-      </div>
-    </div> -->
-    <!-- <div class="close-button">
-      <el-button type="primary" @click="closeSetting">
-        关 闭
-      </el-button>
-    </div> -->
-    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -269,7 +247,6 @@
       </section>
     </div>
     <error-dialog v-model:visible="tipVisible" :list="tipList" @changeTipVisible="changeTipVisible" />
-    <promoter-drawer />
     <approver-drawer :director-max-level="directorMaxLevel" />
     <copyer-drawer />
     <condition-drawer />
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 37d8f1c..2a22a79 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
 import { onMounted, reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -102,7 +102,7 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  $router.push('/process/list')
+  $router.back()
 }
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
@@ -128,6 +128,10 @@
 const changeMessage = (value: string) => {
   form.value.isMessage = value
 }
+
+const createProcessSuccess = () => {
+  close()
+}
 </script>
 
 <template>
@@ -146,7 +150,6 @@
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <!-- {{ form.number }} -->
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
               <!-- <el-form-item label="可选决策项" prop="selectDecision">
@@ -216,7 +219,13 @@
       </detail-page>
 
       <detail-block title="流程配置" />
-      <setting ref="processSetting" :is-add-process="true" :get-row-data="form" :select-form-id="selectFormId" />
+      <setting
+        ref="processSetting"
+        :is-add-process="true"
+        :get-row-data="form"
+        :select-form-id="selectFormId"
+        @createProcessSuccess="createProcessSuccess"
+      />
     </app-container>
   </div>
 </template>

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index e060a8b..2421142 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/train/plan/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
 
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 7fdfe4f..577779f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,15 @@
-<script setup>
+<script setup lang="ts" name="ProcessSetting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
-import promoterDrawer from '@/components/drawer/promoterDrawer.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
 import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
 import userStore from '@/store/modules/user'
+import type { ITipList } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -25,19 +25,20 @@
     default: false,
   },
 })
+const emits = defineEmits(['createProcessSuccess'])
+const processConfig = ref({}) as any
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
 const router = useRouter()
-const tipList = ref([]) // 统计空节点的数组
+const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
-const processConfig = ref({})
 const nodeConfig = ref({})
 const workFlowDef = ref({})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
-const initDetail = async (formid) => {
+const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
 }
@@ -51,7 +52,7 @@
   const route = useRoute()
   nextTick(async () => {
     let data
-    if (!props.isAddProcess) { // 非新建流程--调流程详情接口
+    if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -83,8 +84,8 @@
     processConfig.value = data
     const {
       nodeConfig: nodes,
-      flowPermission: flows,
-      directorMaxLevel: directors,
+      flowPermission: flows, // 发起人
+      // directorMaxLevel: directors,
       workFlowDef: works,
       tableId,
     } = data
@@ -98,7 +99,7 @@
 })
 
 // 统计空节点（红色感叹号）
-const reErr = ({ childNode }) => {
+const reErr = ({ childNode }: any) => {
   if (childNode) {
     const { type, error, nodeName, conditionNodes } = childNode
     if (type == 1 || type == 2) {
@@ -128,10 +129,7 @@
   }
 }
 
-const toReturn = () => {
-  // window.location.href = ""
-}
-
+// 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
     processConfig.value.formId = props.getRowData.formId
@@ -157,7 +155,7 @@
   if (tipList.value.length != 0) { // 存在空节点
     let approverCount = 0
     let conditonCount = 0
-    tipList.value.forEach((item) => {
+    tipList.value.forEach((item: { type: string }) => {
       if (item.type === '审核人') {
         approverCount += 1
       }
@@ -193,6 +191,7 @@
     const res = await addProcess(processConfig.value)
     if (res.code == 200) {
       ElMessage.success('创建流程成功')
+      emits('createProcessSuccess')
     }
   }
   loading.close()
@@ -201,7 +200,7 @@
   saveSet, initDetail,
 })
 
-const zoomSize = (type) => {
+const zoomSize = (type: number) => {
   if (type == 1) {
     if (nowVal.value == 50) {
       return
@@ -217,34 +216,13 @@
 }
 
 // 改变空节点错误对话框显隐
-const changeTipVisible = (val) => {
+const changeTipVisible = (val: boolean) => {
   tipVisible.value = false
 }
 </script>
 
 <template>
   <div class="workFlow-setting">
-    <!-- <div class="fd-nav">
-      <div class="fd-nav-left">
-        <div class="fd-nav-back" @click="toReturn">
-          <i class="anticon anticon-left" />
-        </div>
-        <div class="fd-nav-title">
-          {{ workFlowDef.name }}
-        </div>
-      </div>
-      <div class="fd-nav-right">
-        <button type="button" class="ant-btn button-publish" @click="saveSet">
-          <span>发 布</span>
-        </button>
-      </div>
-    </div> -->
-    <!-- <div class="close-button">
-      <el-button type="primary" @click="closeSetting">
-        关 闭
-      </el-button>
-    </div> -->
-    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -269,7 +247,6 @@
       </section>
     </div>
     <error-dialog v-model:visible="tipVisible" :list="tipList" @changeTipVisible="changeTipVisible" />
-    <promoter-drawer />
     <approver-drawer :director-max-level="directorMaxLevel" />
     <copyer-drawer />
     <condition-drawer />
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 37d8f1c..2a22a79 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
 import { onMounted, reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -102,7 +102,7 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  $router.push('/process/list')
+  $router.back()
 }
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
@@ -128,6 +128,10 @@
 const changeMessage = (value: string) => {
   form.value.isMessage = value
 }
+
+const createProcessSuccess = () => {
+  close()
+}
 </script>
 
 <template>
@@ -146,7 +150,6 @@
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <!-- {{ form.number }} -->
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
               <!-- <el-form-item label="可选决策项" prop="selectDecision">
@@ -216,7 +219,13 @@
       </detail-page>
 
       <detail-block title="流程配置" />
-      <setting ref="processSetting" :is-add-process="true" :get-row-data="form" :select-form-id="selectFormId" />
+      <setting
+        ref="processSetting"
+        :is-add-process="true"
+        :get-row-data="form"
+        :select-form-id="selectFormId"
+        @createProcessSuccess="createProcessSuccess"
+      />
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 9fedcbb..26374ea 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 详情 -->
 <script lang="ts" setup name="DetailProcess">
 import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index e060a8b..2421142 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/train/plan/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
 
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 7fdfe4f..577779f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,15 @@
-<script setup>
+<script setup lang="ts" name="ProcessSetting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
-import promoterDrawer from '@/components/drawer/promoterDrawer.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
 import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
 import userStore from '@/store/modules/user'
+import type { ITipList } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -25,19 +25,20 @@
     default: false,
   },
 })
+const emits = defineEmits(['createProcessSuccess'])
+const processConfig = ref({}) as any
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
 const router = useRouter()
-const tipList = ref([]) // 统计空节点的数组
+const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
-const processConfig = ref({})
 const nodeConfig = ref({})
 const workFlowDef = ref({})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
-const initDetail = async (formid) => {
+const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
 }
@@ -51,7 +52,7 @@
   const route = useRoute()
   nextTick(async () => {
     let data
-    if (!props.isAddProcess) { // 非新建流程--调流程详情接口
+    if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -83,8 +84,8 @@
     processConfig.value = data
     const {
       nodeConfig: nodes,
-      flowPermission: flows,
-      directorMaxLevel: directors,
+      flowPermission: flows, // 发起人
+      // directorMaxLevel: directors,
       workFlowDef: works,
       tableId,
     } = data
@@ -98,7 +99,7 @@
 })
 
 // 统计空节点（红色感叹号）
-const reErr = ({ childNode }) => {
+const reErr = ({ childNode }: any) => {
   if (childNode) {
     const { type, error, nodeName, conditionNodes } = childNode
     if (type == 1 || type == 2) {
@@ -128,10 +129,7 @@
   }
 }
 
-const toReturn = () => {
-  // window.location.href = ""
-}
-
+// 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
     processConfig.value.formId = props.getRowData.formId
@@ -157,7 +155,7 @@
   if (tipList.value.length != 0) { // 存在空节点
     let approverCount = 0
     let conditonCount = 0
-    tipList.value.forEach((item) => {
+    tipList.value.forEach((item: { type: string }) => {
       if (item.type === '审核人') {
         approverCount += 1
       }
@@ -193,6 +191,7 @@
     const res = await addProcess(processConfig.value)
     if (res.code == 200) {
       ElMessage.success('创建流程成功')
+      emits('createProcessSuccess')
     }
   }
   loading.close()
@@ -201,7 +200,7 @@
   saveSet, initDetail,
 })
 
-const zoomSize = (type) => {
+const zoomSize = (type: number) => {
   if (type == 1) {
     if (nowVal.value == 50) {
       return
@@ -217,34 +216,13 @@
 }
 
 // 改变空节点错误对话框显隐
-const changeTipVisible = (val) => {
+const changeTipVisible = (val: boolean) => {
   tipVisible.value = false
 }
 </script>
 
 <template>
   <div class="workFlow-setting">
-    <!-- <div class="fd-nav">
-      <div class="fd-nav-left">
-        <div class="fd-nav-back" @click="toReturn">
-          <i class="anticon anticon-left" />
-        </div>
-        <div class="fd-nav-title">
-          {{ workFlowDef.name }}
-        </div>
-      </div>
-      <div class="fd-nav-right">
-        <button type="button" class="ant-btn button-publish" @click="saveSet">
-          <span>发 布</span>
-        </button>
-      </div>
-    </div> -->
-    <!-- <div class="close-button">
-      <el-button type="primary" @click="closeSetting">
-        关 闭
-      </el-button>
-    </div> -->
-    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -269,7 +247,6 @@
       </section>
     </div>
     <error-dialog v-model:visible="tipVisible" :list="tipList" @changeTipVisible="changeTipVisible" />
-    <promoter-drawer />
     <approver-drawer :director-max-level="directorMaxLevel" />
     <copyer-drawer />
     <condition-drawer />
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 37d8f1c..2a22a79 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
 import { onMounted, reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -102,7 +102,7 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  $router.push('/process/list')
+  $router.back()
 }
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
@@ -128,6 +128,10 @@
 const changeMessage = (value: string) => {
   form.value.isMessage = value
 }
+
+const createProcessSuccess = () => {
+  close()
+}
 </script>
 
 <template>
@@ -146,7 +150,6 @@
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <!-- {{ form.number }} -->
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
               <!-- <el-form-item label="可选决策项" prop="selectDecision">
@@ -216,7 +219,13 @@
       </detail-page>
 
       <detail-block title="流程配置" />
-      <setting ref="processSetting" :is-add-process="true" :get-row-data="form" :select-form-id="selectFormId" />
+      <setting
+        ref="processSetting"
+        :is-add-process="true"
+        :get-row-data="form"
+        :select-form-id="selectFormId"
+        @createProcessSuccess="createProcessSuccess"
+      />
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 9fedcbb..26374ea 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 详情 -->
 <script lang="ts" setup name="DetailProcess">
 import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index 330dda1..f1cdf25 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 编辑 -->
 <script lang="ts" setup name="EditProcess">
 import { onMounted, reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index e060a8b..2421142 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/train/plan/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
 
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 7fdfe4f..577779f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,15 @@
-<script setup>
+<script setup lang="ts" name="ProcessSetting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
-import promoterDrawer from '@/components/drawer/promoterDrawer.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
 import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
 import userStore from '@/store/modules/user'
+import type { ITipList } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -25,19 +25,20 @@
     default: false,
   },
 })
+const emits = defineEmits(['createProcessSuccess'])
+const processConfig = ref({}) as any
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
 const router = useRouter()
-const tipList = ref([]) // 统计空节点的数组
+const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
-const processConfig = ref({})
 const nodeConfig = ref({})
 const workFlowDef = ref({})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
-const initDetail = async (formid) => {
+const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
 }
@@ -51,7 +52,7 @@
   const route = useRoute()
   nextTick(async () => {
     let data
-    if (!props.isAddProcess) { // 非新建流程--调流程详情接口
+    if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -83,8 +84,8 @@
     processConfig.value = data
     const {
       nodeConfig: nodes,
-      flowPermission: flows,
-      directorMaxLevel: directors,
+      flowPermission: flows, // 发起人
+      // directorMaxLevel: directors,
       workFlowDef: works,
       tableId,
     } = data
@@ -98,7 +99,7 @@
 })
 
 // 统计空节点（红色感叹号）
-const reErr = ({ childNode }) => {
+const reErr = ({ childNode }: any) => {
   if (childNode) {
     const { type, error, nodeName, conditionNodes } = childNode
     if (type == 1 || type == 2) {
@@ -128,10 +129,7 @@
   }
 }
 
-const toReturn = () => {
-  // window.location.href = ""
-}
-
+// 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
     processConfig.value.formId = props.getRowData.formId
@@ -157,7 +155,7 @@
   if (tipList.value.length != 0) { // 存在空节点
     let approverCount = 0
     let conditonCount = 0
-    tipList.value.forEach((item) => {
+    tipList.value.forEach((item: { type: string }) => {
       if (item.type === '审核人') {
         approverCount += 1
       }
@@ -193,6 +191,7 @@
     const res = await addProcess(processConfig.value)
     if (res.code == 200) {
       ElMessage.success('创建流程成功')
+      emits('createProcessSuccess')
     }
   }
   loading.close()
@@ -201,7 +200,7 @@
   saveSet, initDetail,
 })
 
-const zoomSize = (type) => {
+const zoomSize = (type: number) => {
   if (type == 1) {
     if (nowVal.value == 50) {
       return
@@ -217,34 +216,13 @@
 }
 
 // 改变空节点错误对话框显隐
-const changeTipVisible = (val) => {
+const changeTipVisible = (val: boolean) => {
   tipVisible.value = false
 }
 </script>
 
 <template>
   <div class="workFlow-setting">
-    <!-- <div class="fd-nav">
-      <div class="fd-nav-left">
-        <div class="fd-nav-back" @click="toReturn">
-          <i class="anticon anticon-left" />
-        </div>
-        <div class="fd-nav-title">
-          {{ workFlowDef.name }}
-        </div>
-      </div>
-      <div class="fd-nav-right">
-        <button type="button" class="ant-btn button-publish" @click="saveSet">
-          <span>发 布</span>
-        </button>
-      </div>
-    </div> -->
-    <!-- <div class="close-button">
-      <el-button type="primary" @click="closeSetting">
-        关 闭
-      </el-button>
-    </div> -->
-    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -269,7 +247,6 @@
       </section>
     </div>
     <error-dialog v-model:visible="tipVisible" :list="tipList" @changeTipVisible="changeTipVisible" />
-    <promoter-drawer />
     <approver-drawer :director-max-level="directorMaxLevel" />
     <copyer-drawer />
     <condition-drawer />
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 37d8f1c..2a22a79 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
 import { onMounted, reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -102,7 +102,7 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  $router.push('/process/list')
+  $router.back()
 }
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
@@ -128,6 +128,10 @@
 const changeMessage = (value: string) => {
   form.value.isMessage = value
 }
+
+const createProcessSuccess = () => {
+  close()
+}
 </script>
 
 <template>
@@ -146,7 +150,6 @@
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <!-- {{ form.number }} -->
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
               <!-- <el-form-item label="可选决策项" prop="selectDecision">
@@ -216,7 +219,13 @@
       </detail-page>
 
       <detail-block title="流程配置" />
-      <setting ref="processSetting" :is-add-process="true" :get-row-data="form" :select-form-id="selectFormId" />
+      <setting
+        ref="processSetting"
+        :is-add-process="true"
+        :get-row-data="form"
+        :select-form-id="selectFormId"
+        @createProcessSuccess="createProcessSuccess"
+      />
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 9fedcbb..26374ea 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 详情 -->
 <script lang="ts" setup name="DetailProcess">
 import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index 330dda1..f1cdf25 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 编辑 -->
 <script lang="ts" setup name="EditProcess">
 import { onMounted, reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index 4c3671d..d6a9b21 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -12,21 +12,6 @@
   offset: number
   limit: number
 }
-// export interface IlistQuery {
-//   category?: string// 流程分类
-//   id?: string // 编号，流程id
-//   formId?: string // 表单id
-//   formName: string// 配置表单编号
-//   name: string // 名称
-//   business: string // 关联业务
-//   directorId: number// 负责人id
-//   person: string // 负责人
-//   deploymentTime?: string // 创建时间
-//   status: string // 当前流程状态
-//   describe?: string // 流程描述
-//   offset: number
-//   limit: number
-// }
 
 export interface Iform {
   number: string // 编号
@@ -46,3 +31,8 @@
   formName: string
 }
 
+export interface ITipList {
+  type: string
+  name?: string
+}
+

diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index c27f353..3938ecd 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -13,3 +13,18 @@
   type?: number
   targetId?: string
 }
+
+// 成员
+export interface IEmployees {
+  id: string
+  name: string // 姓名
+  deptName: string // 所在组织机构
+  statusName: string // 状态
+}
+
+// 成员listQuery
+export interface IEmployeesListQuery {
+  keywords: string
+  offset: number
+  limit: number
+}
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index e19d7e8..7f0ad97 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -32,7 +32,6 @@
 
 <template>
   <el-dialog v-model="visibleDialog" title="流程配置检查">
-    <!-- <div class="ant-confirm-body"> -->
     <el-result icon="warning" :title="`校验失败（${list.length}项错误）`">
       <template #sub-title>
         <div v-if="workFlowStore.approverErrorCount > 0" class="warning-list">
@@ -63,7 +62,6 @@
         </el-button>
       </template>
     </el-result>
-    <!-- </div> -->
   </el-dialog>
 </template>
 
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 4ce1c98..606b6bb 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -1,11 +1,10 @@
 <!-- 选择成员 -->
-<script setup>
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+<script setup lang="ts" name="SelectEmployeesDialog">
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import type { IEmployees } from './dialog'
 import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 
-import { toTreeList } from '@/utils/structure'
-import SearchArea from '@/components/SearchArea/index.vue'
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -32,26 +31,16 @@
   },
 })
 const emits = defineEmits(['update:visible', 'change'])
-const table = ref()
-// 树配置
-const defaultProps = {
-  children: 'children',
-  label: 'name',
-}
+const table = ref() // 表格ref
+
 // 表格表头
-const columns = [
-  // { text: '账号', value: 'account', align: 'center' },
+const columns = ref<TableColumn[]>([
   { text: '真实姓名', value: 'name', align: 'center' },
   { text: '所在组织机构', value: 'deptName', align: 'center' },
-  // { text: '角色', value: 'roleName', align: 'center' },
-  // { text: '手机号', value: 'phone', align: 'center' },
-  // { text: '注册时间', value: 'createtime', align: 'center' },
-]
+])
+
 // 表格数据
-const list = ref([])
-// 组织机构树数据
-const treeData = ref([])
-const tagNames = { 已冻结: 'danger', 启用: 'success' }
+const list = ref<IEmployees[]>([])
 
 const loading = ref(false)
 const total = ref(0)
@@ -80,16 +69,19 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
+
 watch(() => props.visible, (val) => {
+  // 清除上次选中
   if (!val) {
-    console.log(table.value)
     table.value.clearMulti()
   }
 })
+
+// 点击确定，保存选择的成员配置
 const saveDialog = () => {
   // 多选
   if (props.multi) {
@@ -110,20 +102,21 @@
 }
 const select = ref('')
 // 获取列表数据
-const fetchData = (flag) => {
-  select.value = ''
+const fetchData = (isNowPage = false) => {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  loading.value = true
   getUserList(listQuery).then((res) => {
     list.value = res.data.rows
     total.value = res.data.total
+    loading.value = false
   })
 }
-// 点击树形结构
-const handleNodeClick = (data) => {
-  listQuery.deptId = data.id
-  fetchData('click')
-}
+
 // 多选
-const multiSelect = (val) => {
+const multiSelect = (val: any) => {
   multipleTable.value = val
 }
 
@@ -134,48 +127,32 @@
   }).catch(() => {
   })
 }
+
 // 查询数据
 const search = () => {
-  fetchData('search')
+  fetchData(true)
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.limit = val.size
   }
   if (val && val.page) {
     listQuery.offset = val.page
   }
-  fetchData('')
+  fetchData(true)
 }
+
 onMounted(() => {
-  // 获取树形结构数据
-  // fetchTreeData()
   // 获取列表数据
-  fetchData('click')
+  fetchData(true)
 })
 </script>
 
 <template>
   <div class="select-emplotees-dialog">
     <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
-      <!-- <div class="person_body clear chengyuan"> -->
-      <!-- 左侧组织机构 -->
-      <!-- <div class="left-container">
-        <div style="height: 100%;">
-          <el-card class="box-card" shadow="always">
-            <template #header>
-              <div class="clearfix">
-                <span>组织机构</span>
-              </div>
-            </template>
-            <el-tree
-              :data="treeData" :props="defaultProps" default-expand-all
-              :expand-on-click-node="false" @node-click="handleNodeClick"
-            />
-          </el-card>
-        </div>
-      </div> -->
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
@@ -198,6 +175,7 @@
             @change="changePage"
             @multi-select="multiSelect"
           >
+            <!-- 序号 -->
             <template #preColumns>
               <el-table-column label="#" width="55" align="center">
                 <template #default="scope">
@@ -210,6 +188,7 @@
                 </template>
               </el-table-column>
             </template>
+            <!-- 状态 -->
             <template #columns>
               <el-table-column label="状态" align="center" width="80">
                 <template #default="scope">
@@ -257,11 +236,9 @@
   .left-container {
     white-space: nowrap;
     height: 100%;
-    // width: 22%;
   }
 
   .table-area {
-    // width: 78%;
     flex: 1;
     overflow: auto;
 
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 64f51ae..636e03d 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -1,6 +1,6 @@
 <!-- 选择角色 -->
 <script setup lang="ts" name="SelectRoleDialog">
-import { computed, getCurrentInstance, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import type { IroleInfo } from './dialog'
 import { getRoleList } from '@/api/system/role'
 import { toTreeList } from '@/utils/structure'
@@ -34,9 +34,6 @@
 const columns = ref([
   { text: '角色名称', value: 'name', align: 'left' },
   { text: '所在组织机构', value: 'deptName' },
-  // { text: '数据权限类型', value: 'dataScopeTypeName' },
-  // { text: '别名', value: 'tips' },
-  // { text: '排序', value: 'num', width: 80 },
 ])
 const loading = ref(false)
 
@@ -81,9 +78,9 @@
 
 // 角色查询数据
 function fetchRoleData() {
-  // loading.value = true
+  loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: any) => {
+    const data = res.data.map((item: IroleInfo) => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
@@ -91,15 +88,13 @@
     })
     const treeData = toTreeList(data)
     roleList.value = treeData
-
-    // loading.value = false
-    console.log('角色树-----')
-    console.log(roleList.value[0])
+    loading.value = false
   })
 }
 // 多选
 const handleSelectionChange = (val: any) => {
   console.log('多选角色')
+  console.log(val)
   multipleTable.value = val
 }
 // 搜索
@@ -124,12 +119,12 @@
 <template>
   <div class="select-role-dialog">
     <el-dialog v-model="visibleDialog" title="选择角色" max-width="80%" append-to-body custom-class="promoter_person">
-      <div class="person_body clear">
-        <search-area @search="search">
-          <search-item>
-            <el-input v-model="listQuery.keyword" placeholder="角色名称" />
-          </search-item>
-        </search-area>
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="listQuery.keyword" placeholder="角色名称" clearable />
+        </search-item>
+      </search-area>
+      <div style="padding: 12px;max-height: 500px;overflow: auto;">
         <el-table
           ref="table"
           v-loading="loading"
@@ -137,17 +132,20 @@
           :data="roleList"
           row-key="id"
           :border="false"
+          :check-strictly="true"
           style="width: 100%;"
+          :default-expand-all="true"
           :tree-props="{ children: 'children' }"
           @selection-change="handleSelectionChange"
           @select="selectClick"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column
-            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
+            v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :align="column.align"
           />
         </el-table>
       </div>
+
       <template #footer>
         <el-button @click="closeDialog">
           取 消
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 7f5cd2f..2e631a6 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,10 +1,11 @@
 <!-- 审批设置 -->
-<script setup>
+<script setup lang="ts" name="ApproverDrawer">
 import { computed, onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
 import $func from '@/plugins/preload.ts'
+import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
@@ -17,12 +18,11 @@
 
 const workFlowStore = useWorkFlowStore()
 
-const approverConfig = ref({})
+const approverConfig = ref({}) as any
 const approverVisible = ref(false)
 const approverRoleVisible = ref(false)
 const checkedRoleList = ref([])// 角色列表
 const checkedList = ref([]) // 选择的成员
-// const { approverConfig1, approverDrawer } = workFlowStore
 const { setApproverConfig, setApprover } = workFlowStore
 
 const closeDrawer = () => {
@@ -31,33 +31,24 @@
 
 const visible = computed({
   get() {
-    console.log('1')
     return workFlowStore.approverDrawer
   },
   set() {
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: any) => {
   approverConfig.value = val.value
 })
-const changeRange = () => {
-  approverConfig.value.nodeUserList = []
-}
-const changeType = (val) => {
-  approverConfig.value.nodeUserList = []
-  approverConfig.value.examineMode = ''
-  approverConfig.value.noHanderAction = ''
-  if (val === 2) { // 主管
-    approverConfig.value.directorLevel = 1
-  }
-  else if (val === 4) {
-    approverConfig.value.selectMode = 1
-    approverConfig.value.selectRange = 1
-  }
-  else if (val === 7) { // 连续多级主管
-    approverConfig.value.examineEndDirectorLevel = 1
-  }
+
+// 切换负责人
+const changeType = () => {
+  approverConfig.value.nodeUserList = [] // 人员列表
+  approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
+  approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
+  approverConfig.value.noHanderAction = '' // 审批人为空时
+  approverConfig.value.directorLevel = 1 // 主管
+  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -67,24 +58,21 @@
 // 添加角色
 const addRoleApprover = () => {
   approverRoleVisible.value = true
-  console.log('approverRoleVisible.value', approverRoleVisible.value)
   checkedRoleList.value = approverConfig.value.nodeUserList
 }
 // 选择好成员
-const sureApprover = (data) => {
+const sureApprover = (data: IEmployees) => {
   approverConfig.value.nodeUserList = data
   approverVisible.value = false
 }
 // 选择好角色
-const sureRoleApprover = (data) => {
+const sureRoleApprover = (data: IroleInfo) => {
   approverConfig.value.nodeUserList = data
   approverRoleVisible.value = false
 }
-
 // 点击确定，保存审批设置
 const saveApprover = () => {
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
-  console.log(approverConfig.value.settype)
   // 成员
   if (approverConfig.value.settype === 1) {
     if (!approverConfig.value.nodeUserList.length) {
@@ -121,7 +109,6 @@
   }
   // 主管
   else if (approverConfig.value.settype === 2) {
-    console.log(approverConfig.value.directorLevel)
     if (!approverConfig.value.tempExamineMode) {
       ElMessage({
         message: '请选择审批方式',
@@ -155,7 +142,6 @@
     value: approverConfig.value,
     flag: true,
     id: workFlowStore.approverConfig1.id,
-    // id: workFlowStore.approverConfig1.value.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
@@ -165,123 +151,6 @@
 <template>
   <el-drawer v-model="visible" :append-to-body="true" title="审批设置" direction="rtl" custom-class="set_promoter" size="550px" @close="closeDrawer">
     <div class="demo-drawer__content">
-      <!-- <div class="drawer_content">
-        <div class="approver_content">
-          <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-            <el-radio :label="1">
-              指定成员
-            </el-radio>
-            <el-radio :label="2">
-              主管
-            </el-radio>
-            <el-radio :label="4">
-              发起人自选
-            </el-radio>
-            <el-radio :label="5">
-              发起人自己
-            </el-radio>
-            <el-radio :label="7">
-              连续多级主管
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.settype === 1" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <p v-if="approverConfig.settype === 1" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 2" class="approver_manager">
-          <p>
-            <span>发起人的：</span>
-            <select v-model="approverConfig.directorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '直接' : `第${item}级` }}主管
-              </option>
-            </select>
-          </p>
-          <p class="tip">
-            找不到主管时，由上级主管代审批
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 5" class="approver_self">
-          <p>该审批节点设置“发起人自己”后，审批人默认为发起人</p>
-        </div>
-        <div v-show="approverConfig.settype === 4" class="approver_self_select">
-          <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
-            <el-radio :label="1">
-              选一个人
-            </el-radio>
-            <el-radio :label="2">
-              选多个人
-            </el-radio>
-          </el-radio-group>
-          <h3>选择范围</h3>
-          <el-radio-group v-model="approverConfig.selectRange" style="width: 100%;" @change="changeRange">
-            <el-radio :label="1">
-              全公司
-            </el-radio>
-            <el-radio :label="2">
-              指定成员
-            </el-radio>
-            <el-radio :label="3">
-              指定角色
-            </el-radio>
-          </el-radio-group>
-          <el-button v-if="approverConfig.selectRange === 2" type="primary" @click="addApprover">
-            添加/修改成员
-          </el-button>
-          <el-button v-if="approverConfig.selectRange === 3" type="primary" @click="addRoleApprover">
-            添加/修改角色
-          </el-button>
-          <p v-if="approverConfig.selectRange === 2 || approverConfig.selectRange === 3" class="selected_list">
-            <span v-for="(item, index) in approverConfig.nodeUserList" :key="index">{{ item.name }}
-              <img src="@/assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            </span>
-            <a v-if="approverConfig.nodeUserList.length !== 0 && approverConfig.selectRange !== 1" @click="approverConfig.nodeUserList = []">清除</a>
-          </p>
-        </div>
-        <div v-if="approverConfig.settype === 7" class="approver_manager">
-          <p>审批终点</p>
-          <p style="padding-bottom: 20px;">
-            <span>发起人的：</span>
-            <select v-model="approverConfig.examineEndDirectorLevel">
-              <option v-for="item in directorMaxLevel" :key="item" :value="item">
-                {{ item === 1 ? '最高' : `第${item}` }}层级主管
-              </option>
-            </select>
-          </p>
-        </div>
-        <div v-if="(approverConfig.settype === 1 && approverConfig.nodeUserList.length > 1) || approverConfig.settype === 2 || (approverConfig.settype === 4 && approverConfig.selectMode === 2)" class="approver_some">
-          <p>多人审批时采用的审批方式</p>
-          <el-radio-group v-model="approverConfig.examineMode" class="clear">
-            <el-radio :label="1">
-              依次审批
-            </el-radio>
-            <br>
-            <el-radio v-if="approverConfig.settype !== 2" :label="2">
-              会签(须所有审批人同意)
-            </el-radio>
-          </el-radio-group>
-        </div>
-        <div v-if="approverConfig.settype === 2 || approverConfig.settype === 7" class="approver_some">
-          <p>审批人为空时</p>
-          <el-radio-group v-model="approverConfig.noHanderAction" class="clear">
-            <el-radio :label="1">
-              自动审批通过/不允许发起
-            </el-radio>
-            <br>
-            <el-radio :label="2">
-              转交给审核管理员
-            </el-radio>
-          </el-radio-group>
-        </div>
-      </div> -->
-
-      <!-- ------------------------------------------------------------ -->
       <h5 class="add-person">
         负责人
       </h5>
@@ -300,18 +169,9 @@
         </el-radio>
       </el-radio-group>
       <!-- 选择好的成员或者角色 -->
-      <!-- <div class="show-people">
-        <span v-for="item in approverConfig.nodeUserList" :key="item.id" class="selected-people">
-          {{ item.name }}
-          <el-icon style="vertical-align: middle;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
-            <close />
-          </el-icon>
-        </span>
-      </div> -->
       <p v-if="approverConfig && approverConfig.nodeUserList && approverConfig.nodeUserList.length" class="selected_list">
         <span v-for="(item, index) in approverConfig.nodeUserList" :key="index" class="people-box">
           {{ item.name }}
-          <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')"> -->
           <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(approverConfig.nodeUserList, item, 'targetId')">
             <close />
           </el-icon>
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e47da98..0f7424d 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,6 +1,6 @@
 <!-- 条件设置 -->
 <script setup>
-import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -17,7 +17,6 @@
 const conditionRoleVisible = ref(false)
 const checkedfqr = ref(true) // 条件-发起人是否选择
 
-// const { tableId, conditionsConfig1, conditionDrawer } = workFlowStore
 const { setCondition, setConditionsConfig } = workFlowStore
 
 const closeDrawer = (val) => {
@@ -334,18 +333,6 @@
           </template>
         </el-dialog>
       </div>
-      <!-- <employees-role-dialog
-        v-model:visible="conditionRoleVisible"
-        v-model:data="checkedList"
-        :is-department="true"
-        @change="sureConditionRole"
-      /> -->
-      <!-- 角色弹框 -->
-      <!-- <select-role-dialog
-        v-model:visible="approverRoleVisible"
-        v-model:data="checkedRoleList"
-        @change="sureRoleApprover"
-      /> -->
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index bc76e54..199c3f5 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
@@ -11,7 +11,7 @@
 const emits = defineEmits(['update:childNodeP'])
 const workFlowStore = useWorkFlowStore()
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index 5f996d1..fbb5b98 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="AddNodeBan">
 import { ref } from 'vue'
 const props = defineProps({
   childNodeP: {
@@ -8,7 +8,7 @@
 })
 const emits = defineEmits(['update:childNodeP'])
 const visible = ref(false)
-const addType = (type) => {
+const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index b6b1b2b..53e008c 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts" name="NodeWrap">
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -19,8 +19,8 @@
 const userStore = useUserStore()
 
 const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
+const proxy = getCurrentInstance() as any
+const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
 const placeholderList = ['发起人', '审核人', '抄送人']
 const defaultText = computed(() => {
@@ -69,30 +69,30 @@
   }
 })
 // 审批
-watch(() => workFlowStore.approverConfig1, (val) => {
+watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val) => {
+watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val) => {
+watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-watch(() => workFlowStore.copyerConfig1, (val) => {
-  if (val.flag && val.id === _uid) {
-    emits('update:nodeConfig', val.value)
-  }
-})
+// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+//   if (val.flag && val.id === _uid) {
+//     emits('update:nodeConfig', val.value)
+//   }
+// })
 
 const {
   setPromoter,
@@ -104,7 +104,7 @@
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
-const clickEvent = (index) => {
+const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
   }
@@ -112,7 +112,7 @@
     isInput.value = true
   }
 }
-const blurEvent = (index) => {
+const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
@@ -140,7 +140,7 @@
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
 }
-const reData = (data, addData) => {
+const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
   }
@@ -148,9 +148,9 @@
     reData(data.childNode, addData)
   }
 }
-const delTerm = (index) => {
+const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
     item.nodeName = `条件${index + 1}`
   })
@@ -169,7 +169,7 @@
   }
 }
 
-const setPerson = (priorityLevel) => {
+const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig
   if (type == 0) { // 发起人
     // setPromoter(true)
@@ -209,14 +209,14 @@
     })
   }
 }
-const arrTransfer = (index, type = 1) => {
+const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
     index + type,
     1,
     props.nodeConfig.conditionNodes[index],
   )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
   resetConditionNodesErr()
@@ -238,10 +238,10 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
+            @blur="blurEvent(null)"
             @focus="$event.currentTarget.select()"
           >
-          <span v-else class="editable-title" @click="clickEvent()">{{ nodeConfig.nodeName }}</span>
+          <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
         </template>
       </div>
@@ -253,12 +253,12 @@
         <i v-if="props.nodeConfig.type !== 0" class="anticon anticon-right arrow" />
       </div>
       <div v-if="nodeConfig.error" class="error_tip">
-        <!-- <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip"> -->
         <i class="anticon anticon-exclamation-circle" />
       </div>
     </div>
     <add-node v-model:childNodeP="nodeConfig.childNode" />
   </div>
+  <!-- 条件 -->
   <div v-if="nodeConfig.type === 4" class="branch-wrap">
     <div class="branch-box-wrap">
       <div class="branch-box">
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/workFlow/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<script setup>
-defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
-</script>
-
-<template>
-  <ul class="select-box">
-    <template v-for="(elem, i) in list" :key="i">
-      <template v-if="elem.type === 'role'">
-        <li
-          v-for="item in elem.data" :key="item.roleId"
-          class="check_box"
-          :class="{ active: elem.isActive && elem.isActive(item), not: elem.not }"
-          @click="elem.change(item)"
-        >
-          <a :title="item.description" :class="{ active: elem.isActiveItem && elem.isActiveItem(item) }">
-            <img src="@/assets/images/icon_role.png">{{ item.roleName }}
-          </a>
-        </li>
-      </template>
-      <template v-if="elem.type === 'department'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box" :class="{ not: !elem.isDepartment }">
-          <a
-            v-if="elem.isDepartment"
-            :class="elem.isActive(item) && 'active'"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <a v-else><img src="@/assets/images/icon_file.png">{{ item.departmentName }}</a>
-          <i @click="elem.next(item)">下级</i>
-        </li>
-      </template>
-      <template v-if="elem.type === 'employee'">
-        <li v-for="item in elem.data" :key="item.id" class="check_box">
-          <a
-            :class="elem.isActive(item) && 'active'"
-            :title="item.departmentNames"
-            @click="elem.change(item)"
-          >
-            <img src="@/assets/images/icon_people.png">{{ item.employeeName }}
-          </a>
-        </li>
-      </template>
-    </template>
-  </ul>
-</template>
-
-<style lang="scss">
-.select-box {
-  height: 420px;
-  overflow-y: auto;
-
-  li {
-    padding: 5px 0;
-
-    i {
-      float: right;
-      padding-left: 24px;
-      padding-right: 10px;
-      color: #3195f8;
-      font-size: 12px;
-      cursor: pointer;
-      background: url("@/assets/images/next_level_active.png") no-repeat 10px center;
-      border-left: 1px solid rgb(238 238 238);
-    }
-
-    a.active + i {
-      color: rgb(197 197 197);
-      background-image: url("@/assets/images/next_level.png");
-      pointer-events: none;
-    }
-
-    img {
-      width: 14px;
-      vertical-align: middle;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/workFlow/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-defineProps({
-  total: {
-    type: Number,
-    default: 0,
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }],
-  },
-})
-const emits = defineEmits(['del'])
-</script>
-
-<template>
-  <div class="select-result l">
-    <p class="clear">
-      已选（{{ total }}）
-      <a @click="emits('del')">清空</a>
-    </p>
-    <ul>
-      <template v-for="({ type, data, cancel }) in list" :key="type">
-        <template v-if="type === 'role'">
-          <li v-for="item in data" :key="item.roleId">
-            <img src="@/assets/images/icon_role.png">
-            <span>{{ item.roleName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'department'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_file.png">
-            <span>{{ item.departmentName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-        <template v-if="type === 'employee'">
-          <li v-for="item in data" :key="item.id">
-            <img src="@/assets/images/icon_people.png">
-            <span>{{ item.employeeName }}</span>
-            <img src="@/assets/images/cancel.png" @click="cancel(item)">
-          </li>
-        </template>
-      </template>
-    </ul>
-  </div>
-</template>
-
-<style lang="scss">
-.select-result {
-  width: 276px;
-  height: 100%;
-  font-size: 12px;
-
-  ul {
-    height: 460px;
-    overflow-y: auto;
-
-    li {
-      margin: 11px 26px 13px 19px;
-      line-height: 17px;
-
-      span {
-        vertical-align: middle;
-      }
-
-      img {
-        &:first-of-type {
-          width: 14px;
-          vertical-align: middle;
-          margin-right: 5px;
-        }
-
-        &:last-of-type {
-          float: right;
-          margin-top: 2px;
-          width: 14px;
-        }
-      }
-    }
-  }
-
-  p {
-    padding-left: 19px;
-    padding-right: 20px;
-    line-height: 37px;
-    border-bottom: 1px solid #f2f2f2;
-
-    a {
-      float: right;
-    }
-  }
-}
-</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 67066a8..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -342,6 +342,7 @@
   }
 }
 
+// 获取详情
 const getInfo = () => {
   getSapmleDetail({ id: infoId.value }).then((res) => {
     res.data = {
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 5bb8865..74e0a67 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -151,6 +151,8 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
+      sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
 }
@@ -450,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index e060a8b..2421142 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/train/plan/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
 
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 7fdfe4f..577779f 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,15 @@
-<script setup>
+<script setup lang="ts" name="ProcessSetting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
-import promoterDrawer from '@/components/drawer/promoterDrawer.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
 import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
 import userStore from '@/store/modules/user'
+import type { ITipList } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -25,19 +25,20 @@
     default: false,
   },
 })
+const emits = defineEmits(['createProcessSuccess'])
+const processConfig = ref({}) as any
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
 const router = useRouter()
-const tipList = ref([]) // 统计空节点的数组
+const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
-const processConfig = ref({})
 const nodeConfig = ref({})
 const workFlowDef = ref({})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
-const initDetail = async (formid) => {
+const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
 }
@@ -51,7 +52,7 @@
   const route = useRoute()
   nextTick(async () => {
     let data
-    if (!props.isAddProcess) { // 非新建流程--调流程详情接口
+    if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
       data = await initDetail(props.selectFormId)
     }
     else { // 新建流程
@@ -83,8 +84,8 @@
     processConfig.value = data
     const {
       nodeConfig: nodes,
-      flowPermission: flows,
-      directorMaxLevel: directors,
+      flowPermission: flows, // 发起人
+      // directorMaxLevel: directors,
       workFlowDef: works,
       tableId,
     } = data
@@ -98,7 +99,7 @@
 })
 
 // 统计空节点（红色感叹号）
-const reErr = ({ childNode }) => {
+const reErr = ({ childNode }: any) => {
   if (childNode) {
     const { type, error, nodeName, conditionNodes } = childNode
     if (type == 1 || type == 2) {
@@ -128,10 +129,7 @@
   }
 }
 
-const toReturn = () => {
-  // window.location.href = ""
-}
-
+// 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
     processConfig.value.formId = props.getRowData.formId
@@ -157,7 +155,7 @@
   if (tipList.value.length != 0) { // 存在空节点
     let approverCount = 0
     let conditonCount = 0
-    tipList.value.forEach((item) => {
+    tipList.value.forEach((item: { type: string }) => {
       if (item.type === '审核人') {
         approverCount += 1
       }
@@ -193,6 +191,7 @@
     const res = await addProcess(processConfig.value)
     if (res.code == 200) {
       ElMessage.success('创建流程成功')
+      emits('createProcessSuccess')
     }
   }
   loading.close()
@@ -201,7 +200,7 @@
   saveSet, initDetail,
 })
 
-const zoomSize = (type) => {
+const zoomSize = (type: number) => {
   if (type == 1) {
     if (nowVal.value == 50) {
       return
@@ -217,34 +216,13 @@
 }
 
 // 改变空节点错误对话框显隐
-const changeTipVisible = (val) => {
+const changeTipVisible = (val: boolean) => {
   tipVisible.value = false
 }
 </script>
 
 <template>
   <div class="workFlow-setting">
-    <!-- <div class="fd-nav">
-      <div class="fd-nav-left">
-        <div class="fd-nav-back" @click="toReturn">
-          <i class="anticon anticon-left" />
-        </div>
-        <div class="fd-nav-title">
-          {{ workFlowDef.name }}
-        </div>
-      </div>
-      <div class="fd-nav-right">
-        <button type="button" class="ant-btn button-publish" @click="saveSet">
-          <span>发 布</span>
-        </button>
-      </div>
-    </div> -->
-    <!-- <div class="close-button">
-      <el-button type="primary" @click="closeSetting">
-        关 闭
-      </el-button>
-    </div> -->
-    <!-- <el-button>保存</el-button> -->
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
@@ -269,7 +247,6 @@
       </section>
     </div>
     <error-dialog v-model:visible="tipVisible" :list="tipList" @changeTipVisible="changeTipVisible" />
-    <promoter-drawer />
     <approver-drawer :director-max-level="directorMaxLevel" />
     <copyer-drawer />
     <condition-drawer />
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 37d8f1c..2a22a79 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
 import { onMounted, reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -102,7 +102,7 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  $router.push('/process/list')
+  $router.back()
 }
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
@@ -128,6 +128,10 @@
 const changeMessage = (value: string) => {
   form.value.isMessage = value
 }
+
+const createProcessSuccess = () => {
+  close()
+}
 </script>
 
 <template>
@@ -146,7 +150,6 @@
           <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <!-- {{ form.number }} -->
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
               <!-- <el-form-item label="可选决策项" prop="selectDecision">
@@ -216,7 +219,13 @@
       </detail-page>
 
       <detail-block title="流程配置" />
-      <setting ref="processSetting" :is-add-process="true" :get-row-data="form" :select-form-id="selectFormId" />
+      <setting
+        ref="processSetting"
+        :is-add-process="true"
+        :get-row-data="form"
+        :select-form-id="selectFormId"
+        @createProcessSuccess="createProcessSuccess"
+      />
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 9fedcbb..26374ea 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 详情 -->
 <script lang="ts" setup name="DetailProcess">
 import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index 330dda1..f1cdf25 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -1,4 +1,4 @@
-<!-- 编辑流程页面 -->
+<!-- 编辑 -->
 <script lang="ts" setup name="EditProcess">
 import { onMounted, reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index 4c3671d..d6a9b21 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -12,21 +12,6 @@
   offset: number
   limit: number
 }
-// export interface IlistQuery {
-//   category?: string// 流程分类
-//   id?: string // 编号，流程id
-//   formId?: string // 表单id
-//   formName: string// 配置表单编号
-//   name: string // 名称
-//   business: string // 关联业务
-//   directorId: number// 负责人id
-//   person: string // 负责人
-//   deploymentTime?: string // 创建时间
-//   status: string // 当前流程状态
-//   describe?: string // 流程描述
-//   offset: number
-//   limit: number
-// }
 
 export interface Iform {
   number: string // 编号
@@ -46,3 +31,8 @@
   formName: string
 }
 
+export interface ITipList {
+  type: string
+  name?: string
+}
+
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index d0cd697..a89aeb4 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -39,42 +39,20 @@
   },
 ]
 const columns = ref([
-  {
-    text: '流程编号',
-    value: 'number',
-    // width: 150,
-  },
-  {
-    text: '流程名称',
-    value: 'name',
-  },
-  {
-    text: '关联业务',
-    value: 'business',
-  },
-  {
-    text: '当前流程状态',
-    value: 'status',
-  },
-  {
-    text: '流程负责人',
-    value: 'person',
-  },
-  {
-    text: '创建时间',
-    value: 'time',
-  },
-  {
-    text: '流程描述',
-    value: 'describe',
-  },
+  { text: '流程编号', value: 'number' },
+  { text: '流程名称', value: 'name' },
+  { text: '关联业务', value: 'business' },
+  { text: '当前流程状态', value: 'status' },
+  { text: '流程负责人', value: 'person' },
+  { text: '创建时间', value: 'time' },
+  { text: '流程描述', value: 'describe' },
 ])
 const list = ref([])
 const total = ref(20)
-const logTypeList = ref(null)
+// const logTypeList = ref(null)
 const listLoading = ref(false)
-const dialogFormVisible = ref(false)
-const dialogStatus = ref('')
+// const dialogFormVisible = ref(false)
+// const dialogStatus = ref('')
 const checkoutList = ref<string[]>([]) // 多选选中结果
 // 获取流程列表
 const fetchData = async (isNowPage: boolean) => {
@@ -278,11 +256,6 @@
             />
           </search-item>
           <search-item>
-            <!-- <el-input
-              v-model.trim="listQuery.business"
-              placeholder="关联业务"
-              clearable
-            /> -->
             <el-select v-model="listQuery.business" placeholder="请选择关联业务" clearable>
               <el-option
                 v-for="item in businessList"
@@ -332,7 +305,6 @@
           <template #btns-right>
             <icon-button v-if="proxy.hasPerm('/sys/process/add')" icon="icon-add" title="新建" type="primary" @click="add" />
             <icon-button v-if="proxy.hasPerm('/sys/process/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-            <!-- <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" /> -->
             <icon-button v-if="proxy.hasPerm('/sys/process/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
           </template>