diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 4e41e86..7bde3f8 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -143,6 +143,18 @@
           auth: '/file/approve',
         },
       },
+      {
+        path: 'approvedetail/:id?',
+        name: 'approveDetail',
+        component: () => import('@/views/measure/file/components/approve/addDialog.vue'),
+        meta: {
+          title: '文件审批',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/approve',
+        },
+      },
     ],
   },
   {

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 4e41e86..7bde3f8 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -143,6 +143,18 @@
           auth: '/file/approve',
         },
       },
+      {
+        path: 'approvedetail/:id?',
+        name: 'approveDetail',
+        component: () => import('@/views/measure/file/components/approve/addDialog.vue'),
+        meta: {
+          title: '文件审批',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/approve',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 3926c2d..7f3ea3e 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -78,25 +78,25 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  list.value = [
-    {
-      applyName: '借用测试设备',
-      applyNo: '1433223',
-      applyUnit: '顶级',
-      applyPerson: '张三',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '审批中',
-    },
-    {
-      applyName: '借用电脑',
-      applyNo: '1433223',
-      applyUnit: '徐州分中心',
-      applyPerson: '里斯',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '已通过',
-    },
-  ] as any
-  total.value = 2
+  // list.value = [
+  //   {
+  //     applyName: '借用测试设备',
+  //     applyNo: '1433223',
+  //     applyUnit: '顶级',
+  //     applyPerson: '张三',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '审批中',
+  //   },
+  //   {
+  //     applyName: '借用电脑',
+  //     applyNo: '1433223',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '里斯',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '已通过',
+  //   },
+  // ] as any
+  // total.value = 2
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 4e41e86..7bde3f8 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -143,6 +143,18 @@
           auth: '/file/approve',
         },
       },
+      {
+        path: 'approvedetail/:id?',
+        name: 'approveDetail',
+        component: () => import('@/views/measure/file/components/approve/addDialog.vue'),
+        meta: {
+          title: '文件审批',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/approve',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 3926c2d..7f3ea3e 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -78,25 +78,25 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  list.value = [
-    {
-      applyName: '借用测试设备',
-      applyNo: '1433223',
-      applyUnit: '顶级',
-      applyPerson: '张三',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '审批中',
-    },
-    {
-      applyName: '借用电脑',
-      applyNo: '1433223',
-      applyUnit: '徐州分中心',
-      applyPerson: '里斯',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '已通过',
-    },
-  ] as any
-  total.value = 2
+  // list.value = [
+  //   {
+  //     applyName: '借用测试设备',
+  //     applyNo: '1433223',
+  //     applyUnit: '顶级',
+  //     applyPerson: '张三',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '审批中',
+  //   },
+  //   {
+  //     applyName: '借用电脑',
+  //     applyNo: '1433223',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '里斯',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '已通过',
+  //   },
+  // ] as any
+  // total.value = 2
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index c1b20e7..5b7e91a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -100,7 +100,10 @@
   loadingTable.value = true
   getDictByCode('managerState').then((response) => {
     if (response.code === 200) {
-      console.log(response.data, 'response')
+      console.log(response.data, 'response') // 状态
+
+      // 根据闲置，封存，启封等状态获取不同的列表
+      // 接口未写好
       getStatusList(searchQuery).then((res) => {
         if (res.code === 200) {
           list.value = res.data.rows

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 4e41e86..7bde3f8 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -143,6 +143,18 @@
           auth: '/file/approve',
         },
       },
+      {
+        path: 'approvedetail/:id?',
+        name: 'approveDetail',
+        component: () => import('@/views/measure/file/components/approve/addDialog.vue'),
+        meta: {
+          title: '文件审批',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/approve',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 3926c2d..7f3ea3e 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -78,25 +78,25 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  list.value = [
-    {
-      applyName: '借用测试设备',
-      applyNo: '1433223',
-      applyUnit: '顶级',
-      applyPerson: '张三',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '审批中',
-    },
-    {
-      applyName: '借用电脑',
-      applyNo: '1433223',
-      applyUnit: '徐州分中心',
-      applyPerson: '里斯',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '已通过',
-    },
-  ] as any
-  total.value = 2
+  // list.value = [
+  //   {
+  //     applyName: '借用测试设备',
+  //     applyNo: '1433223',
+  //     applyUnit: '顶级',
+  //     applyPerson: '张三',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '审批中',
+  //   },
+  //   {
+  //     applyName: '借用电脑',
+  //     applyNo: '1433223',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '里斯',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '已通过',
+  //   },
+  // ] as any
+  // total.value = 2
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index c1b20e7..5b7e91a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -100,7 +100,10 @@
   loadingTable.value = true
   getDictByCode('managerState').then((response) => {
     if (response.code === 200) {
-      console.log(response.data, 'response')
+      console.log(response.data, 'response') // 状态
+
+      // 根据闲置，封存，启封等状态获取不同的列表
+      // 接口未写好
       getStatusList(searchQuery).then((res) => {
         if (res.code === 200) {
           list.value = res.data.rows
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index e2ff064..27faff8 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -12,6 +12,7 @@
 import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -36,6 +37,7 @@
   createUser: '', // 创建人
   createUserId: '', // 创建人id
   id: '',
+  formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
@@ -130,7 +132,7 @@
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
               console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id }).then((res) => {
+              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
                 formEl?.resetFields()
                 ElMessage.success('提交成功')
                 $router.go(-1)
@@ -234,20 +236,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="类别">
-              <el-input v-model.trim="fileTypeName" disabled />
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 4e41e86..7bde3f8 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -143,6 +143,18 @@
           auth: '/file/approve',
         },
       },
+      {
+        path: 'approvedetail/:id?',
+        name: 'approveDetail',
+        component: () => import('@/views/measure/file/components/approve/addDialog.vue'),
+        meta: {
+          title: '文件审批',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/approve',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 3926c2d..7f3ea3e 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -78,25 +78,25 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  list.value = [
-    {
-      applyName: '借用测试设备',
-      applyNo: '1433223',
-      applyUnit: '顶级',
-      applyPerson: '张三',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '审批中',
-    },
-    {
-      applyName: '借用电脑',
-      applyNo: '1433223',
-      applyUnit: '徐州分中心',
-      applyPerson: '里斯',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '已通过',
-    },
-  ] as any
-  total.value = 2
+  // list.value = [
+  //   {
+  //     applyName: '借用测试设备',
+  //     applyNo: '1433223',
+  //     applyUnit: '顶级',
+  //     applyPerson: '张三',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '审批中',
+  //   },
+  //   {
+  //     applyName: '借用电脑',
+  //     applyNo: '1433223',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '里斯',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '已通过',
+  //   },
+  // ] as any
+  // total.value = 2
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index c1b20e7..5b7e91a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -100,7 +100,10 @@
   loadingTable.value = true
   getDictByCode('managerState').then((response) => {
     if (response.code === 200) {
-      console.log(response.data, 'response')
+      console.log(response.data, 'response') // 状态
+
+      // 根据闲置，封存，启封等状态获取不同的列表
+      // 接口未写好
       getStatusList(searchQuery).then((res) => {
         if (res.code === 200) {
           list.value = res.data.rows
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index e2ff064..27faff8 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -12,6 +12,7 @@
 import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -36,6 +37,7 @@
   createUser: '', // 创建人
   createUserId: '', // 创建人id
   id: '',
+  formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
@@ -130,7 +132,7 @@
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
               console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id }).then((res) => {
+              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
                 formEl?.resetFields()
                 ElMessage.success('提交成功')
                 $router.go(-1)
@@ -234,20 +236,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="类别">
-              <el-input v-model.trim="fileTypeName" disabled />
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
new file mode 100644
index 0000000..f7f9b42
--- /dev/null
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -0,0 +1,387 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../../file-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { printHtml } from '@/utils/printUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const $route = useRoute()
+const $router = useRouter()
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const approvalStatusName = ref() // 审批状态
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+  formId: SCHEDULE.FILE_APPROVAL,
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const formDataRow = ref() // 父组件传来的row
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  title.value = row.title
+  fileList.value = []
+  formDataRow.value = row
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    approvalStatusName.value = row.approvalStatusName
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = () => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    console.log('提交')
+  })
+}
+// 编辑
+const update = (row) => {
+  // $router.push({
+  //   name: 'approveDetail',
+  //   query: {
+  //     ...row,
+  //     title: '编辑',
+  //   },
+  // })
+  initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      console.log('确认删除')
+    })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  $router.go(-1)
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  $router.go(-1)
+}
+const approvalDialog = ref()
+// 审批操作
+const approval = (type: string, taskId: string) => {
+  approvalDialog.value.initDialog(type, taskId)
+}
+// 打印
+const print = () => {
+  printHtml('print')
+}
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title="`文件审批-${title}`">
+      <template #btns>
+        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
+          <el-button type="primary" @click="submitForm">
+            提交
+          </el-button>
+          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
+            编辑
+          </el-button>
+          <el-button type="primary" @click="remove(formDataRow)">
+            删除
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+        <div v-if="approvalStatusName === '待审批' || approvalStatusName === '审批中'">
+          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
+            同意
+          </el-button>
+          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
+            驳回
+          </el-button>
+          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
+            拒绝
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
+          <el-button type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+      </template>
+
+      <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 4e41e86..7bde3f8 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -143,6 +143,18 @@
           auth: '/file/approve',
         },
       },
+      {
+        path: 'approvedetail/:id?',
+        name: 'approveDetail',
+        component: () => import('@/views/measure/file/components/approve/addDialog.vue'),
+        meta: {
+          title: '文件审批',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/approve',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 3926c2d..7f3ea3e 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -78,25 +78,25 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  list.value = [
-    {
-      applyName: '借用测试设备',
-      applyNo: '1433223',
-      applyUnit: '顶级',
-      applyPerson: '张三',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '审批中',
-    },
-    {
-      applyName: '借用电脑',
-      applyNo: '1433223',
-      applyUnit: '徐州分中心',
-      applyPerson: '里斯',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '已通过',
-    },
-  ] as any
-  total.value = 2
+  // list.value = [
+  //   {
+  //     applyName: '借用测试设备',
+  //     applyNo: '1433223',
+  //     applyUnit: '顶级',
+  //     applyPerson: '张三',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '审批中',
+  //   },
+  //   {
+  //     applyName: '借用电脑',
+  //     applyNo: '1433223',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '里斯',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '已通过',
+  //   },
+  // ] as any
+  // total.value = 2
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index c1b20e7..5b7e91a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -100,7 +100,10 @@
   loadingTable.value = true
   getDictByCode('managerState').then((response) => {
     if (response.code === 200) {
-      console.log(response.data, 'response')
+      console.log(response.data, 'response') // 状态
+
+      // 根据闲置，封存，启封等状态获取不同的列表
+      // 接口未写好
       getStatusList(searchQuery).then((res) => {
         if (res.code === 200) {
           list.value = res.data.rows
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index e2ff064..27faff8 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -12,6 +12,7 @@
 import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -36,6 +37,7 @@
   createUser: '', // 创建人
   createUserId: '', // 创建人id
   id: '',
+  formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
@@ -130,7 +132,7 @@
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
               console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id }).then((res) => {
+              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
                 formEl?.resetFields()
                 ElMessage.success('提交成功')
                 $router.go(-1)
@@ -234,20 +236,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="类别">
-              <el-input v-model.trim="fileTypeName" disabled />
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
new file mode 100644
index 0000000..f7f9b42
--- /dev/null
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -0,0 +1,387 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../../file-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { printHtml } from '@/utils/printUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const $route = useRoute()
+const $router = useRouter()
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const approvalStatusName = ref() // 审批状态
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+  formId: SCHEDULE.FILE_APPROVAL,
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const formDataRow = ref() // 父组件传来的row
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  title.value = row.title
+  fileList.value = []
+  formDataRow.value = row
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    approvalStatusName.value = row.approvalStatusName
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = () => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    console.log('提交')
+  })
+}
+// 编辑
+const update = (row) => {
+  // $router.push({
+  //   name: 'approveDetail',
+  //   query: {
+  //     ...row,
+  //     title: '编辑',
+  //   },
+  // })
+  initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      console.log('确认删除')
+    })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  $router.go(-1)
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  $router.go(-1)
+}
+const approvalDialog = ref()
+// 审批操作
+const approval = (type: string, taskId: string) => {
+  approvalDialog.value.initDialog(type, taskId)
+}
+// 打印
+const print = () => {
+  printHtml('print')
+}
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title="`文件审批-${title}`">
+      <template #btns>
+        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
+          <el-button type="primary" @click="submitForm">
+            提交
+          </el-button>
+          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
+            编辑
+          </el-button>
+          <el-button type="primary" @click="remove(formDataRow)">
+            删除
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+        <div v-if="approvalStatusName === '待审批' || approvalStatusName === '审批中'">
+          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
+            同意
+          </el-button>
+          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
+            驳回
+          </el-button>
+          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
+            拒绝
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
+          <el-button type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+      </template>
+
+      <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 08b03c3..9b5c151 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,36 +1,43 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import addDialog from './addDialog.vue'
+import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
-// import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { approvallistPageApi, approvallistPageDetailApi } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-// import { uploadApi } from '@/api/system/notice'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
-  value: {
-    type: String,
-    default: '',
-  },
+})
+const $router = useRouter()
+const approvalStatus = ref('0')
+watch(() => props.name, (_) => {
+  //  获取当前状态
+  getDictByCode('approvalStatus').then((res) => {
+    approvalStatus.value = res.data.filter((item: fileResType) => item.name === props.name)[0].value || '0'
+  })
+},
+{
+  deep: true,
+  immediate: true,
 })
 const searchQuery = reactive({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: '', // 审批状态
+  approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
-  fileType: '', // 类型
-  formId: '',
+  fileType: '', // 文件类别
+  formId: SCHEDULE.FILE_APPROVAL,
+  ids: [],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -39,33 +46,65 @@
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '类别', value: 'fileType', align: 'center' },
-  { text: '创建时间', value: 'publishTime', align: 'center' },
   { text: '创建人', value: 'create', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-const fileTypeList = ref([])
-// 获取审批状态
-const getStatus = () => {
-  getDictByCode('approvalStatus').then((res) => {
-    if (res.code === 200) {
-      fileTypeList.value = res.data
-      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-    }
-  })
-}
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
+  // loadingTable.value = true
+  // approvallistPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      approvalStatus: '1',
+      approvalStatusName: '草稿箱',
+      createUser: '张三',
+      fileName: 'test',
+      fileNo: '1234',
+      fileCode: '1234',
+      fileTypeName: '计量文件1',
+      createTime: '2022-12-12 00:00:00',
+      create: '张三3',
+    },
+    {
+      approvalStatus: '3',
+      approvalStatusName: '审批中',
+      createUser: '张三',
+      fileName: 'test',
+      fileNo: '1234',
+      fileCode: '1234',
+      fileTypeName: '计量文件2',
+      createTime: '2022-12-12 00:00:00',
+      create: '张三2',
+    },
+    {
+      approvalStatus: '5',
+      approvalStatusName: '未通过',
+      createUser: '张三',
+      fileName: 'test',
+      fileNo: '1234',
+      fileCode: '1234',
+      fileTypeName: '计量文件3',
+      createTime: '2022-12-12 00:00:00',
+      create: '张三1',
+    },
+  ] as any
+  total.value = 1
+}
+const fileTypeList = ref<fileResType[]>([])
+// 获取文件类别
+const getFileType = () => {
+  getDictByCode('fileType').then((res) => {
+    fileTypeList.value = res.data
   })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -79,46 +118,15 @@
   getList()
 }
 // 详情
-// const detail = (row: fileListType) => {
-//   addRef.value.initDialog({
-//     ...row,
-//     fileType: searchQuery.fileType,
-//     fileTypeName: props.name,
-//     title: '详情',
-//   })
-// }
-// 下载(单个)
-// const exportSelf = (row: fileListType) => {
-//   exportExcel({
-//     json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-//     name: props.name,
-//     titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-//     sheetName: 'sheet1',
-//   })
-// }
-// 废止
-// const abolish = (row: fileListType) => {
-//   ElMessageBox.confirm(
-//     `确认废止${row.fileName}吗？`,
-//     '提示',
-//     {
-//       confirmButtonText: '确认',
-//       cancelButtonText: '取消',
-//       type: 'warning',
-//     },
-//   )
-//     .then(() => {
-//       updateApi({ id: row.id as string }).then((res) => {
-//         if (res.code === 200) {
-//           ElMessage({
-//             type: 'success',
-//             message: '操作成功',
-//           })
-//           getList()
-//         }
-//       })
-//     })
-// }
+const detail = (row) => {
+  $router.push({
+    name: 'approveDetail',
+    query: {
+      title: '详情',
+      ...row,
+    },
+  })
+}
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
@@ -131,44 +139,44 @@
     },
   )
     .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
+      console.log('确认删除')
+    })
+}
+// 取消
+const cancel = (row) => {
+  ElMessageBox.confirm(
+    `确认取消${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      console.log('确认取消')
     })
 }
 // 搜索
 const search = () => {
   getList()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  search()
+}
+const approvalDialog = ref()
+// 审批操作
+const approval = (type: string, taskId: string) => {
+  approvalDialog.value.initDialog(type, taskId)
+}
 // 重置
 const reset = () => {
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
   getList()
 }
-// 模板下载
-// const templateDownload = () => {
-
-// }
-// 新增
-// const add = () => {
-//   dialogVisible.value = true
-//   addRef.value.initDialog({
-//     fileType: searchQuery.fileType,
-//     title: '新增',
-//     fileTypeName: props.name,
-//   })
-// }
 // 表格被选中的行
 const selectList = ref([])
 // 表格多选
@@ -215,43 +223,31 @@
     ElMessage('无可打印内容')
   }
 }
-// const fileRef = ref() // 文件上传input
-// const onFileChange = (event: any) => {
-//   // 原生上传图片
-//   // console.log(event.target.files)
-//   // if (event.target.files[0].type === 'application/pdf') {
-//   if (event.target.files?.length !== 0) {
-//     // 创建formdata对象
-//     const fd = new FormData()
-//     fd.append('multipartFile', event.target.files[0])
-//     uploadApi(fd).then((res) => {
-//       if (res.code === 200) {
-//         ElMessage.success('上传成功')
-//       }
-//       else {
-//         ElMessage.error(res.message)
-//       }
-//     })
-//   }
-// //   }
-// //   else {
-// //     ElMessage.error('请上传pdf格式')
-// //   }
-// }
-// 批量导入
-// const batchImport = () => {
-//   fileRef.value.click()
-// }
-// 传给子组件的刷新事件
-// const refreshDta = () => {
-//   getList()
-//   dialogVisible.value = false
-// }
+// 是否审批中或者待审批
+const isApproval = computed(() => {
+  return (row) => {
+    if (row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批') {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+})
+// 是否已通过或者未通过
+const isPass = computed(() => {
+  return (row) => {
+    if (row.approvalStatusName === '已通过' || row.approvalStatusName === '未通过') {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+})
 onMounted(() => {
-  getStatus()
-  // getType().then((_) => {
+  getFileType()
   getList()
-  // })
 })
 </script>
 
@@ -259,20 +255,20 @@
   <div>
     <!-- <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" /> -->
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
-        <!-- <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2" placeholder="文件类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -280,39 +276,29 @@
               :value="item.value"
             />
           </el-select>
-        </search-item> -->
+        </search-item>
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-            class="normal-date"
-            style="width: 170px;"
           />
-        </search-item>
-        <search-item>
           <!-- <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-            placeholder="实施时间"
-            class="normal-date"
-            style="width: 130px;"
+            v-model="searchQuery.createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
           /> -->
-          <el-input v-model="searchQuery.createUser" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
-            <el-option
-              v-for="item in effectiveStatusSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select> -->
+          <el-input v-model="searchQuery.createUser" placeholder="创建人" clearable class="w-50 m-2" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -337,22 +323,22 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('agree', row.taskId)">
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('reject', row.taskId)">
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('refuse', row.taskId)">
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="cancel(row)">
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button size="small" type="danger" :disabled="isPass(row)" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -360,6 +346,7 @@
           </template>
         </normal-table>
       </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     </app-container>
   </div>
 </template>

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 4e41e86..7bde3f8 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -143,6 +143,18 @@
           auth: '/file/approve',
         },
       },
+      {
+        path: 'approvedetail/:id?',
+        name: 'approveDetail',
+        component: () => import('@/views/measure/file/components/approve/addDialog.vue'),
+        meta: {
+          title: '文件审批',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/approve',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 3926c2d..7f3ea3e 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -78,25 +78,25 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  list.value = [
-    {
-      applyName: '借用测试设备',
-      applyNo: '1433223',
-      applyUnit: '顶级',
-      applyPerson: '张三',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '审批中',
-    },
-    {
-      applyName: '借用电脑',
-      applyNo: '1433223',
-      applyUnit: '徐州分中心',
-      applyPerson: '里斯',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '已通过',
-    },
-  ] as any
-  total.value = 2
+  // list.value = [
+  //   {
+  //     applyName: '借用测试设备',
+  //     applyNo: '1433223',
+  //     applyUnit: '顶级',
+  //     applyPerson: '张三',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '审批中',
+  //   },
+  //   {
+  //     applyName: '借用电脑',
+  //     applyNo: '1433223',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '里斯',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '已通过',
+  //   },
+  // ] as any
+  // total.value = 2
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index c1b20e7..5b7e91a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -100,7 +100,10 @@
   loadingTable.value = true
   getDictByCode('managerState').then((response) => {
     if (response.code === 200) {
-      console.log(response.data, 'response')
+      console.log(response.data, 'response') // 状态
+
+      // 根据闲置，封存，启封等状态获取不同的列表
+      // 接口未写好
       getStatusList(searchQuery).then((res) => {
         if (res.code === 200) {
           list.value = res.data.rows
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index e2ff064..27faff8 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -12,6 +12,7 @@
 import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -36,6 +37,7 @@
   createUser: '', // 创建人
   createUserId: '', // 创建人id
   id: '',
+  formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
@@ -130,7 +132,7 @@
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
               console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id }).then((res) => {
+              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
                 formEl?.resetFields()
                 ElMessage.success('提交成功')
                 $router.go(-1)
@@ -234,20 +236,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="类别">
-              <el-input v-model.trim="fileTypeName" disabled />
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
new file mode 100644
index 0000000..f7f9b42
--- /dev/null
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -0,0 +1,387 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../../file-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { printHtml } from '@/utils/printUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const $route = useRoute()
+const $router = useRouter()
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const approvalStatusName = ref() // 审批状态
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+  formId: SCHEDULE.FILE_APPROVAL,
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const formDataRow = ref() // 父组件传来的row
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  title.value = row.title
+  fileList.value = []
+  formDataRow.value = row
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    approvalStatusName.value = row.approvalStatusName
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = () => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    console.log('提交')
+  })
+}
+// 编辑
+const update = (row) => {
+  // $router.push({
+  //   name: 'approveDetail',
+  //   query: {
+  //     ...row,
+  //     title: '编辑',
+  //   },
+  // })
+  initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      console.log('确认删除')
+    })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  $router.go(-1)
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  $router.go(-1)
+}
+const approvalDialog = ref()
+// 审批操作
+const approval = (type: string, taskId: string) => {
+  approvalDialog.value.initDialog(type, taskId)
+}
+// 打印
+const print = () => {
+  printHtml('print')
+}
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title="`文件审批-${title}`">
+      <template #btns>
+        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
+          <el-button type="primary" @click="submitForm">
+            提交
+          </el-button>
+          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
+            编辑
+          </el-button>
+          <el-button type="primary" @click="remove(formDataRow)">
+            删除
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+        <div v-if="approvalStatusName === '待审批' || approvalStatusName === '审批中'">
+          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
+            同意
+          </el-button>
+          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
+            驳回
+          </el-button>
+          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
+            拒绝
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
+          <el-button type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+      </template>
+
+      <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 08b03c3..9b5c151 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,36 +1,43 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import addDialog from './addDialog.vue'
+import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
-// import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { approvallistPageApi, approvallistPageDetailApi } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-// import { uploadApi } from '@/api/system/notice'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
-  value: {
-    type: String,
-    default: '',
-  },
+})
+const $router = useRouter()
+const approvalStatus = ref('0')
+watch(() => props.name, (_) => {
+  //  获取当前状态
+  getDictByCode('approvalStatus').then((res) => {
+    approvalStatus.value = res.data.filter((item: fileResType) => item.name === props.name)[0].value || '0'
+  })
+},
+{
+  deep: true,
+  immediate: true,
 })
 const searchQuery = reactive({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: '', // 审批状态
+  approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
-  fileType: '', // 类型
-  formId: '',
+  fileType: '', // 文件类别
+  formId: SCHEDULE.FILE_APPROVAL,
+  ids: [],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -39,33 +46,65 @@
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '类别', value: 'fileType', align: 'center' },
-  { text: '创建时间', value: 'publishTime', align: 'center' },
   { text: '创建人', value: 'create', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-const fileTypeList = ref([])
-// 获取审批状态
-const getStatus = () => {
-  getDictByCode('approvalStatus').then((res) => {
-    if (res.code === 200) {
-      fileTypeList.value = res.data
-      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-    }
-  })
-}
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
+  // loadingTable.value = true
+  // approvallistPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      approvalStatus: '1',
+      approvalStatusName: '草稿箱',
+      createUser: '张三',
+      fileName: 'test',
+      fileNo: '1234',
+      fileCode: '1234',
+      fileTypeName: '计量文件1',
+      createTime: '2022-12-12 00:00:00',
+      create: '张三3',
+    },
+    {
+      approvalStatus: '3',
+      approvalStatusName: '审批中',
+      createUser: '张三',
+      fileName: 'test',
+      fileNo: '1234',
+      fileCode: '1234',
+      fileTypeName: '计量文件2',
+      createTime: '2022-12-12 00:00:00',
+      create: '张三2',
+    },
+    {
+      approvalStatus: '5',
+      approvalStatusName: '未通过',
+      createUser: '张三',
+      fileName: 'test',
+      fileNo: '1234',
+      fileCode: '1234',
+      fileTypeName: '计量文件3',
+      createTime: '2022-12-12 00:00:00',
+      create: '张三1',
+    },
+  ] as any
+  total.value = 1
+}
+const fileTypeList = ref<fileResType[]>([])
+// 获取文件类别
+const getFileType = () => {
+  getDictByCode('fileType').then((res) => {
+    fileTypeList.value = res.data
   })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -79,46 +118,15 @@
   getList()
 }
 // 详情
-// const detail = (row: fileListType) => {
-//   addRef.value.initDialog({
-//     ...row,
-//     fileType: searchQuery.fileType,
-//     fileTypeName: props.name,
-//     title: '详情',
-//   })
-// }
-// 下载(单个)
-// const exportSelf = (row: fileListType) => {
-//   exportExcel({
-//     json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-//     name: props.name,
-//     titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-//     sheetName: 'sheet1',
-//   })
-// }
-// 废止
-// const abolish = (row: fileListType) => {
-//   ElMessageBox.confirm(
-//     `确认废止${row.fileName}吗？`,
-//     '提示',
-//     {
-//       confirmButtonText: '确认',
-//       cancelButtonText: '取消',
-//       type: 'warning',
-//     },
-//   )
-//     .then(() => {
-//       updateApi({ id: row.id as string }).then((res) => {
-//         if (res.code === 200) {
-//           ElMessage({
-//             type: 'success',
-//             message: '操作成功',
-//           })
-//           getList()
-//         }
-//       })
-//     })
-// }
+const detail = (row) => {
+  $router.push({
+    name: 'approveDetail',
+    query: {
+      title: '详情',
+      ...row,
+    },
+  })
+}
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
@@ -131,44 +139,44 @@
     },
   )
     .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
+      console.log('确认删除')
+    })
+}
+// 取消
+const cancel = (row) => {
+  ElMessageBox.confirm(
+    `确认取消${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      console.log('确认取消')
     })
 }
 // 搜索
 const search = () => {
   getList()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  search()
+}
+const approvalDialog = ref()
+// 审批操作
+const approval = (type: string, taskId: string) => {
+  approvalDialog.value.initDialog(type, taskId)
+}
 // 重置
 const reset = () => {
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
   getList()
 }
-// 模板下载
-// const templateDownload = () => {
-
-// }
-// 新增
-// const add = () => {
-//   dialogVisible.value = true
-//   addRef.value.initDialog({
-//     fileType: searchQuery.fileType,
-//     title: '新增',
-//     fileTypeName: props.name,
-//   })
-// }
 // 表格被选中的行
 const selectList = ref([])
 // 表格多选
@@ -215,43 +223,31 @@
     ElMessage('无可打印内容')
   }
 }
-// const fileRef = ref() // 文件上传input
-// const onFileChange = (event: any) => {
-//   // 原生上传图片
-//   // console.log(event.target.files)
-//   // if (event.target.files[0].type === 'application/pdf') {
-//   if (event.target.files?.length !== 0) {
-//     // 创建formdata对象
-//     const fd = new FormData()
-//     fd.append('multipartFile', event.target.files[0])
-//     uploadApi(fd).then((res) => {
-//       if (res.code === 200) {
-//         ElMessage.success('上传成功')
-//       }
-//       else {
-//         ElMessage.error(res.message)
-//       }
-//     })
-//   }
-// //   }
-// //   else {
-// //     ElMessage.error('请上传pdf格式')
-// //   }
-// }
-// 批量导入
-// const batchImport = () => {
-//   fileRef.value.click()
-// }
-// 传给子组件的刷新事件
-// const refreshDta = () => {
-//   getList()
-//   dialogVisible.value = false
-// }
+// 是否审批中或者待审批
+const isApproval = computed(() => {
+  return (row) => {
+    if (row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批') {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+})
+// 是否已通过或者未通过
+const isPass = computed(() => {
+  return (row) => {
+    if (row.approvalStatusName === '已通过' || row.approvalStatusName === '未通过') {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+})
 onMounted(() => {
-  getStatus()
-  // getType().then((_) => {
+  getFileType()
   getList()
-  // })
 })
 </script>
 
@@ -259,20 +255,20 @@
   <div>
     <!-- <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" /> -->
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
-        <!-- <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2" placeholder="文件类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -280,39 +276,29 @@
               :value="item.value"
             />
           </el-select>
-        </search-item> -->
+        </search-item>
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-            class="normal-date"
-            style="width: 170px;"
           />
-        </search-item>
-        <search-item>
           <!-- <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-            placeholder="实施时间"
-            class="normal-date"
-            style="width: 130px;"
+            v-model="searchQuery.createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
           /> -->
-          <el-input v-model="searchQuery.createUser" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
-            <el-option
-              v-for="item in effectiveStatusSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select> -->
+          <el-input v-model="searchQuery.createUser" placeholder="创建人" clearable class="w-50 m-2" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -337,22 +323,22 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('agree', row.taskId)">
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('reject', row.taskId)">
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('refuse', row.taskId)">
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="cancel(row)">
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button size="small" type="danger" :disabled="isPass(row)" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -360,6 +346,7 @@
           </template>
         </normal-table>
       </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     </app-container>
   </div>
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index b45c38b..2f40ba2 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -8,6 +8,7 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   name: {
     type: String,
@@ -37,6 +38,7 @@
   offset: 1,
   fileType: '', // 类型
   ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 }) // 查询参数
 watch(() => publishTime.value, (newVal) => {
   if (newVal) {

diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 4e41e86..7bde3f8 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -143,6 +143,18 @@
           auth: '/file/approve',
         },
       },
+      {
+        path: 'approvedetail/:id?',
+        name: 'approveDetail',
+        component: () => import('@/views/measure/file/components/approve/addDialog.vue'),
+        meta: {
+          title: '文件审批',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/file/approve',
+        },
+      },
     ],
   },
   {
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 3926c2d..7f3ea3e 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -78,25 +78,25 @@
   // }).catch((_) => {
   //   loadingTable.value = false
   // })
-  list.value = [
-    {
-      applyName: '借用测试设备',
-      applyNo: '1433223',
-      applyUnit: '顶级',
-      applyPerson: '张三',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '审批中',
-    },
-    {
-      applyName: '借用电脑',
-      applyNo: '1433223',
-      applyUnit: '徐州分中心',
-      applyPerson: '里斯',
-      time: '2020-12-12 00:00:00',
-      approvalStatusName: '已通过',
-    },
-  ] as any
-  total.value = 2
+  // list.value = [
+  //   {
+  //     applyName: '借用测试设备',
+  //     applyNo: '1433223',
+  //     applyUnit: '顶级',
+  //     applyPerson: '张三',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '审批中',
+  //   },
+  //   {
+  //     applyName: '借用电脑',
+  //     applyNo: '1433223',
+  //     applyUnit: '徐州分中心',
+  //     applyPerson: '里斯',
+  //     time: '2020-12-12 00:00:00',
+  //     approvalStatusName: '已通过',
+  //   },
+  // ] as any
+  // total.value = 2
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index c1b20e7..5b7e91a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -100,7 +100,10 @@
   loadingTable.value = true
   getDictByCode('managerState').then((response) => {
     if (response.code === 200) {
-      console.log(response.data, 'response')
+      console.log(response.data, 'response') // 状态
+
+      // 根据闲置，封存，启封等状态获取不同的列表
+      // 接口未写好
       getStatusList(searchQuery).then((res) => {
         if (res.code === 200) {
           list.value = res.data.rows
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index e2ff064..27faff8 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -12,6 +12,7 @@
 import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
 import type { userType } from '@/views/system/user/user-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -36,6 +37,7 @@
   createUser: '', // 创建人
   createUserId: '', // 创建人id
   id: '',
+  formId: SCHEDULE.FILE_APPROVAL,
 }) // 表单
 const rules = ref<FormRules>({
   fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
@@ -130,7 +132,7 @@
           confirmDrafts(ruleForm).then((res) => {
             if (res.code == 200) {
               console.log(res.data, '保存成功')
-              submitFile({ id: res.data.id }).then((res) => {
+              submitFile({ id: res.data.id, formId: SCHEDULE.FILE_APPROVAL }).then((res) => {
                 formEl?.resetFields()
                 ElMessage.success('提交成功')
                 $router.go(-1)
@@ -234,20 +236,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="类别">
-              <el-input v-model.trim="fileTypeName" disabled />
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
           <el-col :span="6">
             <el-form-item label="文件号" prop="fileCode">
               <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称" prop="fileName">
-              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/file/components/approve/addDialog.vue b/src/views/measure/file/components/approve/addDialog.vue
new file mode 100644
index 0000000..f7f9b42
--- /dev/null
+++ b/src/views/measure/file/components/approve/addDialog.vue
@@ -0,0 +1,387 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup>
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../../file-interface'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { toTreeList } from '@/utils/structure'
+import { printHtml } from '@/utils/printUtils'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi, confirmDrafts, submitFile } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+const $route = useRoute()
+const $router = useRouter()
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const approvalStatusName = ref() // 审批状态
+const title = ref('')
+const fileList = ref<UploadUserFile[]>([])
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+  formId: SCHEDULE.FILE_APPROVAL,
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+const PubListTree = ref([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+    PubListTree.value = toTreeList(res.data, '0', true)
+  })
+}
+const formDataRow = ref() // 父组件传来的row
+// 弹窗初始化
+const initDialog = (row: any) => {
+  ruleFormRef.value?.resetFields()
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  title.value = row.title
+  fileList.value = []
+  formDataRow.value = row
+  getuser()
+  getuser()
+  getPubList()
+  if (row.title === '新建') {
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+    ruleForm.publishTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  }
+  else if (row.title === '详情') {
+    ruleForm.createUserId = row.createUserId
+    ruleForm.fileNo = row.fileNo
+    ruleForm.fileName = row.fileName
+    ruleForm.fileCode = row.fileCode
+    fileTypeName.value = row.fileTypeName
+    ruleForm.publisher = row.publisher
+    ruleForm.effectiveTime = row.effectiveTime
+    effectiveStatusName.value = row.effectiveStatusName
+    ruleForm.remark = row.remark
+    ruleForm.publishTime = row.publishTime
+    ruleForm.minioFileName = row.minioFileName
+    approvalStatusName.value = row.approvalStatusName
+  }
+}
+onMounted(() => {
+  initDialog($route.query)
+})
+// 关闭弹窗
+const close = () => {
+  ruleForm.fileType = ''
+  ruleForm.fileName = ''
+  ruleForm.fileCode = ''
+  ruleForm.minioFileName = ''
+  ruleForm.publishTime = ''
+  ruleForm.remark = ''
+  ruleForm.publishTime = ''
+  ruleForm.effectiveTime = ''
+  ruleForm.effectiveStatus = ''
+  ruleForm.publishTime = ''
+  ruleForm.createUserId = ''
+  effectiveStatusName.value = ''
+}
+// 提交
+const submitForm = () => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    console.log('提交')
+  })
+}
+// 编辑
+const update = (row) => {
+  // $router.push({
+  //   name: 'approveDetail',
+  //   query: {
+  //     ...row,
+  //     title: '编辑',
+  //   },
+  // })
+  initDialog({
+    ...row,
+    title: '编辑',
+  })
+}
+// 删除
+const remove = (row) => {
+  ElMessageBox.confirm(
+    '确认删除吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      console.log('确认删除')
+    })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+  $router.go(-1)
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+  $router.go(-1)
+}
+const approvalDialog = ref()
+// 审批操作
+const approval = (type: string, taskId: string) => {
+  approvalDialog.value.initDialog(type, taskId)
+}
+// 打印
+const print = () => {
+  printHtml('print')
+}
+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) {
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  if (title.value !== '详情') {
+    const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'hour')
+    if (diffDat < 0) {
+    // ruleForm.effectiveStatusName = '已废止'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else if (diffDat == 0) {
+    // ruleForm.effectiveStatusName = '在使用'
+      effectiveStatusName.value = '在使用'
+      ruleForm.effectiveStatus = '1'
+    }
+    else {
+    // ruleForm.effectiveStatusName = '未使用'
+      effectiveStatusName.value = '未使用'
+      ruleForm.effectiveStatus = '2'
+    }
+  }
+})
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <detail-page :title="`文件审批-${title}`">
+      <template #btns>
+        <div v-if="approvalStatusName === '草稿箱' || approvalStatusName === '已取消'">
+          <el-button type="primary" @click="submitForm">
+            提交
+          </el-button>
+          <el-button v-if="title !== '编辑'" type="primary" @click="update(formDataRow)">
+            编辑
+          </el-button>
+          <el-button type="primary" @click="remove(formDataRow)">
+            删除
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+        <div v-if="approvalStatusName === '待审批' || approvalStatusName === '审批中'">
+          <el-button type="primary" @click="approval('agree', formDataRow.taskId)">
+            同意
+          </el-button>
+          <el-button type="primary" @click="approval('reject', formDataRow.taskId)">
+            驳回
+          </el-button>
+          <el-button type="primary" @click="approval('refuse', formDataRow.taskId)">
+            拒绝
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+        <div v-if="approvalStatusName === '已通过' || approvalStatusName === '未通过'">
+          <el-button type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button type="info" @click="resetForm(ruleFormRef)">
+            关闭
+          </el-button>
+        </div>
+      </template>
+
+      <el-form id="print" ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="制度文件编号" prop="fileNo">
+              <el-input v-model.trim="ruleForm.fileNo" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" placeholder="名称" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文件号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="文件号" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <el-input v-model.trim="fileTypeName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <dept-select v-model="ruleForm.publisher" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '请选择发布单位'" :disabled="title === '详情'" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施时间" prop="effectiveTime">
+              <el-date-picker
+                v-model="ruleForm.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled="title === '详情'"
+                placeholder="请选择实施时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              <el-input v-model.trim="effectiveStatusName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建时间" prop="publishTime">
+              <el-date-picker
+                v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" :disabled="title === '详情'"
+                placeholder="请选择创建时间"
+                class="normal-date"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'" style="width: 100%;">
+                <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-if="title === '详情'" v-model.trim="ruleForm.remark" :disabled="title === '详情'" />
+              <el-input v-else v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
+            <el-form-item label="附件" prop="minioFileName">
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
+                v-else
+                v-model:file-list="fileList"
+                enctype="multipart/form-data"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-remove="beforeRemove"
+                :on-exceed="handleExceed"
+                :limit="1"
+              >
+                <el-button type="primary">
+                  上传
+                </el-button>
+              </el-upload> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/approve/templatePage.vue b/src/views/measure/file/components/approve/templatePage.vue
index 08b03c3..9b5c151 100644
--- a/src/views/measure/file/components/approve/templatePage.vue
+++ b/src/views/measure/file/components/approve/templatePage.vue
@@ -1,36 +1,43 @@
 <!-- 文件审批公共模板 -->
 <script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-// import addDialog from './addDialog.vue'
+import type { fileResType } from '@/views/measure/file/file-interface'
 import { printJSON } from '@/utils/printUtils'
-// import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { approvallistPageApi, approvallistPageDetailApi } from '@/api/measure/file'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-// import { uploadApi } from '@/api/system/notice'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
-  value: {
-    type: String,
-    default: '',
-  },
+})
+const $router = useRouter()
+const approvalStatus = ref('0')
+watch(() => props.name, (_) => {
+  //  获取当前状态
+  getDictByCode('approvalStatus').then((res) => {
+    approvalStatus.value = res.data.filter((item: fileResType) => item.name === props.name)[0].value || '0'
+  })
+},
+{
+  deep: true,
+  immediate: true,
 })
 const searchQuery = reactive({
   fileNo: '', // 编号
   fileName: '', // 名称
-  publishTime: '', // 发布时间
   fileCode: '', // 文件号
   createUser: '', // 创建人
   createTime: '', // 创建
-  approvalStatus: '', // 审批状态
+  approvalStatus: approvalStatus.value, // 审批状态
   limit: 20,
   offset: 1,
-  fileType: '', // 类型
-  formId: '',
+  fileType: '', // 文件类别
+  formId: SCHEDULE.FILE_APPROVAL,
+  ids: [],
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
@@ -39,33 +46,65 @@
   { text: '编号', value: 'fileNo', align: 'center' },
   { text: '文件号', value: 'fileCode', align: 'center' },
   { text: '类别', value: 'fileType', align: 'center' },
-  { text: '创建时间', value: 'publishTime', align: 'center' },
   { text: '创建人', value: 'create', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ]) // 表格
 const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
-const fileTypeList = ref([])
-// 获取审批状态
-const getStatus = () => {
-  getDictByCode('approvalStatus').then((res) => {
-    if (res.code === 200) {
-      fileTypeList.value = res.data
-      searchQuery.fileType = res.data.filter(item => item.name === props.name)[0].value
-    }
-  })
-}
 // 获取数据列表
 const getList = () => {
-  loadingTable.value = true
-  approvallistPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
+  // loadingTable.value = true
+  // approvallistPageApi(searchQuery).then((res) => {
+  //   if (res.code === 200) {
+  //     list.value = res.data.rows
+  //     total.value = res.data.total
+  //   }
+  //   loadingTable.value = false
+  // }).catch((_) => {
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      approvalStatus: '1',
+      approvalStatusName: '草稿箱',
+      createUser: '张三',
+      fileName: 'test',
+      fileNo: '1234',
+      fileCode: '1234',
+      fileTypeName: '计量文件1',
+      createTime: '2022-12-12 00:00:00',
+      create: '张三3',
+    },
+    {
+      approvalStatus: '3',
+      approvalStatusName: '审批中',
+      createUser: '张三',
+      fileName: 'test',
+      fileNo: '1234',
+      fileCode: '1234',
+      fileTypeName: '计量文件2',
+      createTime: '2022-12-12 00:00:00',
+      create: '张三2',
+    },
+    {
+      approvalStatus: '5',
+      approvalStatusName: '未通过',
+      createUser: '张三',
+      fileName: 'test',
+      fileNo: '1234',
+      fileCode: '1234',
+      fileTypeName: '计量文件3',
+      createTime: '2022-12-12 00:00:00',
+      create: '张三1',
+    },
+  ] as any
+  total.value = 1
+}
+const fileTypeList = ref<fileResType[]>([])
+// 获取文件类别
+const getFileType = () => {
+  getDictByCode('fileType').then((res) => {
+    fileTypeList.value = res.data
   })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -79,46 +118,15 @@
   getList()
 }
 // 详情
-// const detail = (row: fileListType) => {
-//   addRef.value.initDialog({
-//     ...row,
-//     fileType: searchQuery.fileType,
-//     fileTypeName: props.name,
-//     title: '详情',
-//   })
-// }
-// 下载(单个)
-// const exportSelf = (row: fileListType) => {
-//   exportExcel({
-//     json: [row].map((item: fileListType, index: number) => ({ index: index + 1, fileName: item.fileName, fileNo: item.fileNo, fileCode: item.fileCode, fileType: item.fileType, publishTime: item.publishTime, effectiveTime: item.effectiveTime, effectiveStatus: item.effectiveStatus })),
-//     name: props.name,
-//     titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-//     sheetName: 'sheet1',
-//   })
-// }
-// 废止
-// const abolish = (row: fileListType) => {
-//   ElMessageBox.confirm(
-//     `确认废止${row.fileName}吗？`,
-//     '提示',
-//     {
-//       confirmButtonText: '确认',
-//       cancelButtonText: '取消',
-//       type: 'warning',
-//     },
-//   )
-//     .then(() => {
-//       updateApi({ id: row.id as string }).then((res) => {
-//         if (res.code === 200) {
-//           ElMessage({
-//             type: 'success',
-//             message: '操作成功',
-//           })
-//           getList()
-//         }
-//       })
-//     })
-// }
+const detail = (row) => {
+  $router.push({
+    name: 'approveDetail',
+    query: {
+      title: '详情',
+      ...row,
+    },
+  })
+}
 // 删除
 const remove = (row) => {
   ElMessageBox.confirm(
@@ -131,44 +139,44 @@
     },
   )
     .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
+      console.log('确认删除')
+    })
+}
+// 取消
+const cancel = (row) => {
+  ElMessageBox.confirm(
+    `确认取消${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      console.log('确认取消')
     })
 }
 // 搜索
 const search = () => {
   getList()
 }
+// 审批结束回调
+const approvalSuccess = () => {
+  search()
+}
+const approvalDialog = ref()
+// 审批操作
+const approval = (type: string, taskId: string) => {
+  approvalDialog.value.initDialog(type, taskId)
+}
 // 重置
 const reset = () => {
   searchQuery.fileNo = ''
   searchQuery.fileName = ''
   searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
   getList()
 }
-// 模板下载
-// const templateDownload = () => {
-
-// }
-// 新增
-// const add = () => {
-//   dialogVisible.value = true
-//   addRef.value.initDialog({
-//     fileType: searchQuery.fileType,
-//     title: '新增',
-//     fileTypeName: props.name,
-//   })
-// }
 // 表格被选中的行
 const selectList = ref([])
 // 表格多选
@@ -215,43 +223,31 @@
     ElMessage('无可打印内容')
   }
 }
-// const fileRef = ref() // 文件上传input
-// const onFileChange = (event: any) => {
-//   // 原生上传图片
-//   // console.log(event.target.files)
-//   // if (event.target.files[0].type === 'application/pdf') {
-//   if (event.target.files?.length !== 0) {
-//     // 创建formdata对象
-//     const fd = new FormData()
-//     fd.append('multipartFile', event.target.files[0])
-//     uploadApi(fd).then((res) => {
-//       if (res.code === 200) {
-//         ElMessage.success('上传成功')
-//       }
-//       else {
-//         ElMessage.error(res.message)
-//       }
-//     })
-//   }
-// //   }
-// //   else {
-// //     ElMessage.error('请上传pdf格式')
-// //   }
-// }
-// 批量导入
-// const batchImport = () => {
-//   fileRef.value.click()
-// }
-// 传给子组件的刷新事件
-// const refreshDta = () => {
-//   getList()
-//   dialogVisible.value = false
-// }
+// 是否审批中或者待审批
+const isApproval = computed(() => {
+  return (row) => {
+    if (row.approvalStatusName === '审批中' || row.approvalStatusName === '待审批') {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+})
+// 是否已通过或者未通过
+const isPass = computed(() => {
+  return (row) => {
+    if (row.approvalStatusName === '已通过' || row.approvalStatusName === '未通过') {
+      return true
+    }
+    else {
+      return false
+    }
+  }
+})
 onMounted(() => {
-  getStatus()
-  // getType().then((_) => {
+  getFileType()
   getList()
-  // })
 })
 </script>
 
@@ -259,20 +255,20 @@
   <div>
     <!-- <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" /> -->
     <!-- 布局 -->
-    <app-container v-show="!dialogVisible">
+    <app-container>
       <!-- 筛选条件 -->
       <search-area :need-clear="true" @search="search" @clear="reset">
         <search-item>
-          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2" />
         </search-item>
-        <!-- <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2" placeholder="文件类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -280,39 +276,29 @@
               :value="item.value"
             />
           </el-select>
-        </search-item> -->
+        </search-item>
         <search-item>
           <el-date-picker
             v-model="searchQuery.createTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="创建时间"
-            class="normal-date"
-            style="width: 170px;"
           />
-        </search-item>
-        <search-item>
           <!-- <el-date-picker
-            v-model="searchQuery.effectiveTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-            placeholder="实施时间"
-            class="normal-date"
-            style="width: 130px;"
+            v-model="searchQuery.createTime"
+            type="datetimerange"
+            format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
+            range-separator="至"
+            start-placeholder="创建开始时间"
+            end-placeholder="创建结束时间"
+            clearable
           /> -->
-          <el-input v-model="searchQuery.createUser" placeholder="创建人" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <!-- <el-select v-model="searchQuery.effectiveStatus" class="m-2 normal-select" placeholder="实施状态">
-            <el-option
-              v-for="item in effectiveStatusSelect"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
-          </el-select> -->
+          <el-input v-model="searchQuery.createUser" placeholder="创建人" clearable class="w-50 m-2" />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <!-- <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange"> -->
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
         </template>
@@ -337,22 +323,22 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="250">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('agree', row.taskId)">
                   同意
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('reject', row.taskId)">
                   驳回
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="approval('refuse', row.taskId)">
                   拒绝
                 </el-button>
-                <el-button size="small" type="primary" link>
+                <el-button size="small" type="primary" link :disabled="!isApproval(row)" @click="cancel(row)">
                   取消
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button size="small" type="danger" :disabled="isPass(row)" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
@@ -360,6 +346,7 @@
           </template>
         </normal-table>
       </table-container>
+      <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     </app-container>
   </div>
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index b45c38b..2f40ba2 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -8,6 +8,7 @@
 // import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const props = defineProps({
   name: {
     type: String,
@@ -37,6 +38,7 @@
   offset: 1,
   fileType: '', // 类型
   ids: [] as string[],
+  formId: SCHEDULE.FILE_APPROVAL,
 }) // 查询参数
 watch(() => publishTime.value, (newVal) => {
   if (newVal) {
diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts
index 585d618..b7a47a5 100644
--- a/src/views/measure/file/file-interface.ts
+++ b/src/views/measure/file/file-interface.ts
@@ -14,6 +14,7 @@
   effectiveEndTime: string
   effectiveStartTime: string
   ids: string[]
+  formId: string
 }
 // 文件返回值类型
 export interface fileListType {