diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index b0fd947..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,383 +1,8 @@
 <!-- 计量规程 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规程', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规程')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规程',
-    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: '计量规程',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规程',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规程',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规程" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index b0fd947..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,383 +1,8 @@
 <!-- 计量规程 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规程', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规程')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规程',
-    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: '计量规程',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规程',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规程',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规程" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 8d0ef94..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,377 +1,8 @@
 <!-- 计量规章制度 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规章制度', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规章制度')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规章制度',
-    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: '计量规章制度',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规章制度',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规章制度',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规章制度" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index b0fd947..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,383 +1,8 @@
 <!-- 计量规程 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规程', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规程')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规程',
-    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: '计量规程',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规程',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规程',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规程" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 8d0ef94..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,377 +1,8 @@
 <!-- 计量规章制度 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规章制度', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规章制度')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规章制度',
-    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: '计量规章制度',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规章制度',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规章制度',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规章制度" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 2fed3e6..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,383 +1,8 @@
 <!-- 校验检测办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '校验检测办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '校验检测办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '校验检测办法',
-    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: '校验检测办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '校验检测办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '校验检测办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="校验检测办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index b0fd947..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,383 +1,8 @@
 <!-- 计量规程 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规程', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规程')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规程',
-    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: '计量规程',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规程',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规程',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规程" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 8d0ef94..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,377 +1,8 @@
 <!-- 计量规章制度 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规章制度', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规章制度')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规章制度',
-    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: '计量规章制度',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规章制度',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规章制度',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规章制度" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 2fed3e6..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,383 +1,8 @@
 <!-- 校验检测办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '校验检测办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '校验检测办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '校验检测办法',
-    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: '校验检测办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '校验检测办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '校验检测办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="校验检测办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index b0fd947..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,383 +1,8 @@
 <!-- 计量规程 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规程', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规程')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规程',
-    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: '计量规程',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规程',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规程',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规程" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 8d0ef94..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,377 +1,8 @@
 <!-- 计量规章制度 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规章制度', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规章制度')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规章制度',
-    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: '计量规章制度',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规章制度',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规章制度',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规章制度" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 2fed3e6..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,383 +1,8 @@
 <!-- 校验检测办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '校验检测办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '校验检测办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '校验检测办法',
-    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: '校验检测办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '校验检测办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '校验检测办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="校验检测办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index b0fd947..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,383 +1,8 @@
 <!-- 计量规程 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规程', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规程')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规程',
-    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: '计量规程',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规程',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规程',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规程" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 8d0ef94..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,377 +1,8 @@
 <!-- 计量规章制度 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规章制度', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规章制度')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规章制度',
-    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: '计量规章制度',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规章制度',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规章制度',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规章制度" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 2fed3e6..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,383 +1,8 @@
 <!-- 校验检测办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '校验检测办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '校验检测办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '校验检测办法',
-    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: '校验检测办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '校验检测办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '校验检测办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="校验检测办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 63058ee..ef9723d 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -64,6 +64,7 @@
     title: '更新',
   })
 }
+
 // 详情
 const detail = (row: signType) => {
   addRef.value.initDialog({
@@ -137,9 +138,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签名管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +200,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +220,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +241,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index b0fd947..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,383 +1,8 @@
 <!-- 计量规程 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规程', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规程')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规程',
-    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: '计量规程',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规程',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规程',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规程" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 8d0ef94..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,377 +1,8 @@
 <!-- 计量规章制度 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规章制度', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规章制度')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规章制度',
-    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: '计量规章制度',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规章制度',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规章制度',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规章制度" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 2fed3e6..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,383 +1,8 @@
 <!-- 校验检测办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '校验检测办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '校验检测办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '校验检测办法',
-    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: '校验检测办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '校验检测办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '校验检测办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="校验检测办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 63058ee..ef9723d 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -64,6 +64,7 @@
     title: '更新',
   })
 }
+
 // 详情
 const detail = (row: signType) => {
   addRef.value.initDialog({
@@ -137,9 +138,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签名管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +200,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +220,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +241,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 2d44769..aaa60ba 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '证书报告',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,16 +228,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index b0fd947..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,383 +1,8 @@
 <!-- 计量规程 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规程', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规程')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规程',
-    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: '计量规程',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规程',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规程',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规程" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 8d0ef94..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,377 +1,8 @@
 <!-- 计量规章制度 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规章制度', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规章制度')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规章制度',
-    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: '计量规章制度',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规章制度',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规章制度',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规章制度" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 2fed3e6..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,383 +1,8 @@
 <!-- 校验检测办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '校验检测办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '校验检测办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '校验检测办法',
-    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: '校验检测办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '校验检测办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '校验检测办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="校验检测办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 63058ee..ef9723d 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -64,6 +64,7 @@
     title: '更新',
   })
 }
+
 // 详情
 const detail = (row: signType) => {
   addRef.value.initDialog({
@@ -137,9 +138,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签名管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +200,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +220,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +241,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 2d44769..aaa60ba 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '证书报告',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,16 +228,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 0643a0d..1495ac2 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '原始记录',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '原始记录模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -200,18 +226,18 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="300">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index e96ae7e..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main.ts
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..1a20584 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -141,7 +141,7 @@
 
 <template>
   <div class="normal-table">
-    <el-table ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
+    <el-table id="print" ref="table" v-loading="loading" :data="data" height="height" :size="size" :border="false" style="width: 100%;">
       <slot name="preColumns" />
       <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" :show-overflow-tooltip="column.showOverflow ? column.showOverflow : true" />
       <slot name="columns" />
diff --git a/src/views/measure/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index d8c3c8c..b53f401 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -1,383 +1,8 @@
 <!-- CNAS文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: 'CNAS文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === 'CNAS文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: 'CNAS文件',
-    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: 'CNAS文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: 'CNAS文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: 'CNAS文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="CNAS文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 75a0768..ca0b90b 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -58,7 +58,6 @@
 }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row)
   ruleForm.fileType = row.fileType
   fileTypeName.value = row.fileTypeName
   dialogVisible.value = true
@@ -74,7 +73,6 @@
 defineExpose({ initDialog })
 // 关闭弹窗
 const close = () => {
-  dialogVisible.value = false
   emits('resetData')
 }
 // 提交
@@ -95,7 +93,6 @@
           addApi(ruleForm).then((res) => {
             if (res.code == 200) {
               formEl?.resetFields()
-              dialogVisible.value = false
               ElMessage.success('提交成功')
               emits('resetData')
             }
@@ -113,7 +110,6 @@
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
-  dialogVisible.value = false
   emits('resetData')
 }
 const fileList = ref<UploadUserFile[]>([])
@@ -170,124 +166,144 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
-    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
-      <el-row :gutter="24">
-        <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="文件号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="类别">
-            <span>{{ fileTypeName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="发布单位" prop="publisher">
-            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
-              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </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 HH:mm:ss"
-              placeholder="请选择实施时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="实施状态">
-            {{ effectiveStatusName }}
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="创建时间" prop="publishTime">
-            <el-date-picker
-              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择创建时间"
-              class="normal-date"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="创建人" prop="createUserId">
-            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
-              <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">
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="附件" prop="minioFileName">
-            <el-upload
-              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-row :gutter="24">
-        <el-col :span="24" class="btn-container">
+  <app-container style="overflow: hidden;">
+    <div class="body-container">
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+        <div class="header marg">
+          <div class="title">
+            新建{{ fileTypeName }}
+          </div>
           <span class="btns">
-            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '提交')">
               提交
             </el-button>
-            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+            <el-button type="primary" plain @click="submitForm(ruleFormRef, '保存')">
               保存
             </el-button>
-            <el-button type="info" @click="resetForm(ruleFormRef)">
+            <el-button type="info" plain @click="resetForm(ruleFormRef)">
               关闭
             </el-button>
           </span>
-        </el-col>
-      </el-row>
-    </el-form>
-  </el-dialog>
+        </div>
+        <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="文件号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="类别">
+              <span>{{ fileTypeName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="发布单位" prop="publisher">
+              <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+                <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </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 HH:mm:ss"
+                placeholder="请选择实施时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="实施状态">
+              {{ effectiveStatusName }}
+            </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" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择创建时间"
+                class="normal-date"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人" prop="createUserId">
+              <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+                <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-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">
+              <el-upload
+                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>
+    </div>
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.btn-container {
-  position: relative;
+.body-container {
+  background-color: #fff;
 
-  .btns {
-    position: relative;
-    left: 50%;
-    top: 0;
-    margin-left: -108px;
+  .header {
+    background-color: #ccc;
+    height: 40px;
+    border-radius: 8px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+
+    .title {
+      font-weight: 700;
+    }
+
+    .btns {
+      position: absolute;
+      right: 40px;
+      top: 34px;
+    }
   }
 }
+
+.marg {
+  margin-top: 20px;
+}
 </style>
diff --git a/src/views/measure/file/components/detailDialog.vue b/src/views/measure/file/components/detailDialog.vue
new file mode 100644
index 0000000..5c58d15
--- /dev/null
+++ b/src/views/measure/file/components/detailDialog.vue
@@ -0,0 +1,293 @@
+<!-- 新增或详情弹窗 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import type { deptType } from '../file-interface'
+import { getUserList } from '@/api/system/user'
+import useUserStore from '@/store/modules/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { UploadFile, addApi } from '@/api/measure/file'
+import type { userType } from '@/views/system/user/user-interface'
+const emits = defineEmits(['resetData'])
+const ruleFormRef = ref<FormInstance>() // from组件
+const userInfo = useUserStore() // 当前用户信息
+const ruleForm = reactive({
+  fileType: '', // 类型
+  fileTypeName: '', // 类型名称  不传
+  fileName: '', // 名称
+  fileNo: '', // 编号  不传
+  fileCode: '', // 文件号
+  minioFileName: '', // 上传文件返回名称
+  publishTime: '', // 发布时间
+  publisher: '', // 发布单位
+  remark: '', // 备注
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  effectiveStatusName: '', // 实时状态名字  不传
+  createUser: '', // 创建人
+  createUserId: '', // 创建人id
+  id: '',
+}) // 表单
+const fileTypeName = ref('')
+const effectiveStatusName = ref('')
+const title = ref('')
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  publishTime: [{ required: true, message: '创建不能为空', trigger: 'blur' }],
+  publisher: [{ required: true, message: '发布单位不能为空', trigger: 'blur' }],
+  minioFileName: [{ required: true, message: '上传文件不能为空', trigger: 'blur' }],
+  effectiveTime: [{ required: true, message: '实施时间不能为空', trigger: 'blur' }],
+  createUserId: [{ required: true, message: '发布人不能为空', trigger: 'blur' }],
+  fileCode: [{ required: true, message: '文件号不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const dialogVisible = ref<boolean>(false) // 弹窗显示
+const userList = ref<userType[]>([]) // 可使用人列表
+const getuser = () => {
+  getUserList({ offset: 1, limit: 99999 }).then((res) => {
+    userList.value = res.data.rows
+  })
+} // 获取创建人列表
+const PubList = ref<deptType[]>([])
+// 获取发布单位列表
+const getPubList = () => {
+  getDeptTreeList().then((res) => {
+    PubList.value = res.data
+  })
+}
+// 弹窗初始化
+const initDialog = (row: any) => {
+  console.log(row)
+  ruleForm.fileType = row.fileType
+  fileTypeName.value = row.fileTypeName
+  dialogVisible.value = true
+  getuser()
+  if (row.title === '新增') {
+    getuser()
+    getPubList()
+    // 默认发布人和发布单位
+    ruleForm.createUserId = userInfo.$state.id
+    ruleForm.publisher = userInfo.$state.deptId
+  }
+}
+defineExpose({ initDialog, dialogVisible })
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  emits('resetData')
+}
+// 提交
+const submitForm = async (formEl: FormInstance | undefined, flag: string) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+    `确认${flag}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+      ).then((res) => {
+        if (flag == '提交') {
+          addApi(ruleForm).then((res) => {
+            if (res.code == 200) {
+              formEl?.resetFields()
+              dialogVisible.value = false
+              ElMessage.success('提交成功')
+              emits('resetData')
+            }
+          })
+        }
+        else {
+          // 保存
+          // 暂时未写
+          ElMessage.success('保存成功')
+        }
+      })
+    }
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  dialogVisible.value = false
+  emits('resetData')
+}
+const fileList = ref<UploadUserFile[]>([])
+
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+  )
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      ruleForm.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ruleFormRef.value?.validateField('minioFileName')
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+// 实施状态判断
+// const statusList = ref([
+//   { name: '在使用', id: '1595030082091040769', value: '1' },
+//   { name: '未使用', id: '1595030082544025602', value: '2' },
+//   { name: '已废止', id: '1595030083114450945', value: '3' },
+// ])
+watch(() => ruleForm.effectiveTime, (newVal) => {
+  const diffDat = dayjs(newVal).diff(dayjs().format('YYYY-MM-DD HH:mm:ss'), 'day')
+  if (diffDat < 0) {
+    effectiveStatusName.value = '已废止'
+    ruleForm.effectiveStatus = '3'
+  }
+  else if (diffDat == 0) {
+    effectiveStatusName.value = '在使用'
+    ruleForm.effectiveStatus = '1'
+  }
+  else {
+    effectiveStatusName.value = '未使用'
+    ruleForm.effectiveStatus = '2'
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="80%" append-to-body @close="resetForm">
+    <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px">
+      <el-row :gutter="24">
+        <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="文件号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类别">
+            <span>{{ fileTypeName }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="发布单位" prop="publisher">
+            <el-select v-model="ruleForm.publisher" placeholder="请选择发布单位" :disabled="title === '详情'">
+              <el-option v-for="item in PubList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </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 HH:mm:ss"
+              placeholder="请选择实施时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施状态">
+            {{ effectiveStatusName }}
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <el-form-item label="创建时间" prop="publishTime">
+            <el-date-picker
+              v-model="ruleForm.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="请选择创建时间"
+              class="normal-date"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建人" prop="createUserId">
+            <el-select v-model="ruleForm.createUserId" placeholder="请选择创建人" :disabled="title === '详情'">
+              <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">
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="ruleForm.remark" placeholder="请输入备注" :disabled="title === '详情'" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="附件" prop="minioFileName">
+            <el-upload
+              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-row :gutter="24">
+        <el-col :span="24" class="btn-container">
+          <span class="btns">
+            <el-button type="primary" @click="submitForm(ruleFormRef, '提交')">
+              提交
+            </el-button>
+            <el-button type="primary" @click="submitForm(ruleFormRef, '保存')">
+              保存
+            </el-button>
+            <el-button type="info" @click="resetForm(ruleFormRef)">
+              关闭
+            </el-button>
+          </span>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.btn-container {
+  position: relative;
+
+  .btns {
+    position: relative;
+    left: 50%;
+    top: 0;
+    margin-left: -108px;
+  }
+}
+</style>
diff --git a/src/views/measure/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index ce469fd..9d1c3c7 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -1,383 +1,8 @@
 <!-- 作业文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '作业文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '作业文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '作业文件',
-    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: '作业文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '作业文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '作业文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="作业文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index b677f40..4e9a8f1 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -1,384 +1,8 @@
 <!-- 程序文件 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '程序文件', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '程序文件')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '程序文件',
-    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: '程序文件',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '程序文件',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '程序文件',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="程序文件" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
-
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index 63c5eee..d220d4e 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -1,383 +1,8 @@
 <!-- 质量手册 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '质量手册', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '质量手册')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '质量手册',
-    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: '质量手册',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '质量手册',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="质量手册" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 727ec6f..151649e 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -1,383 +1,8 @@
 <!-- 计量法规 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量法规', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量法规')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量法规',
-    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: '签名管理',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量法规',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '签名管理',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量法规" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index d35c080..c50c700 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -1,383 +1,8 @@
 <!-- 技术能力 -->
-<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '技术能力', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '技术能力')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '技术能力',
-    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: '技术能力',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '技术能力',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '技术能力',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="技术能力" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
new file mode 100644
index 0000000..1d97b6d
--- /dev/null
+++ b/src/views/measure/file/components/templatePage.vue
@@ -0,0 +1,398 @@
+<!-- 计量文件公共模板 -->
+<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 { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
+import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
+import { getDictByCode } from '@/api/system/dict'
+import { exportExcel } from '@/utils/exportXlsx'
+import { uploadApi } from '@/api/system/notice'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '',
+  },
+})
+const searchQuery = reactive<fileSearchType>({
+  fileNo: '', // 编号
+  fileName: '', // 名称
+  publishTime: '', // 发布时间
+  fileCode: '', // 文件号
+  effectiveTime: '', // 实施时间
+  effectiveStatus: '', // 实施状态
+  limit: 10,
+  offset: 1,
+  fileType: '', // 类型
+}) // 查询参数
+const loadingTable = ref<boolean>(false) // 表格loading
+const total = ref<number>(0) // 数据总条数
+const columns = ref([
+  { text: '名称', value: 'fileName', align: 'center' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '类别', value: 'fileType', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
+]) // 表格
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: props.name, // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+const list = ref([]) // 表格数据
+const addRef = ref() // 添加/编辑/详情/组件
+const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
+// 获取类型
+const fileTypeList = ref<fileResType[]>([])
+const getType = async () => {
+  const res = await getDictByCode('fileType')
+  fileTypeList.value = res.data
+  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === props.name)[0].value
+}
+const effectiveStatusSelect = ref<fileResType[]>([])
+// 获取实施状态
+const getStatus = () => {
+  getDictByCode('effectiveStatus').then((res) => {
+    if (res.code === 200) {
+      effectiveStatusSelect.value = res.data
+    }
+  })
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  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 remove = (row: fileListType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.fileName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApi({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          getList()
+        }
+      })
+    })
+}
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+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 exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      if (res.data.rows.length) {
+        exportExcel({
+          json: res.data.rows.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',
+        })
+      }
+      else {
+        ElMessage({
+          type: 'warning',
+          message: '暂无数据',
+        })
+      }
+    }
+    loading.close()
+  }).catch((_) => {
+    loading.close()
+  })
+}
+// 打印
+const print = () => {
+
+}
+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
+}
+onMounted(() => {
+  getStatus()
+  getType().then((_) => {
+    getList()
+  })
+})
+</script>
+
+<template>
+  <div>
+    <add-dialog v-show="dialogVisible" ref="addRef" @reset-data="refreshDta" />
+    <!-- 布局 -->
+    <app-container v-show="!dialogVisible">
+      <!-- 筛选条件 -->
+      <search-area @search="search">
+        <search-item>
+          <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
+        </search-item>
+        <search-item>
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+            <el-option
+              v-for="item in fileTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            placeholder="发布时间"
+            class="normal-date"
+            style="width: 130px;"
+          />
+        </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;"
+          />
+        </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>
+        </search-item>
+        <template #btns>
+          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
+            重置
+          </el-button>
+        </template>
+      </search-area>
+      <table-container>
+        <!-- 表头区域 -->
+        <template #btns-right>
+          <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
+          <el-button type="primary" @click="batchImport">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="templateDownload">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportExcelBtn">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary" @click="print">
+            打印
+          </el-button>
+        </template>
+        <!-- 表格区域 -->
+        <normal-table
+          id="print"
+          :data="list" :total="total" :columns="columns as any"
+          :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+          :list-loading="loadingTable"
+          @change="changePage"
+        >
+          <template #preColumns>
+            <el-table-column label="序号" width="55" align="center">
+              <template #default="scope">
+                {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+              </template>
+            </el-table-column>
+          </template>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button size="small" type="primary" link @click="detail(row)">
+                  查看
+                </el-button>
+                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                  下载
+                </el-button>
+                <el-button size="small" type="primary" link @click="abolish(row)">
+                  废止
+                </el-button>
+                <el-button size="small" type="danger" link @click="remove(row)">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.normal-input {
+  width: 130px !important;
+}
+
+.normal-date {
+  width: 130px !important;
+}
+
+.normal-select {
+  width: 130px !important;
+}
+
+:deep(.el-table__header) {
+  background-color: #bbb;
+}
+</style>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 8d13e01..2b55537 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -1,383 +1,8 @@
 <!-- 计量管理办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量管理办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量管理办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量管理办法',
-    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: '计量管理办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量管理办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量管理办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="false" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量管理办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index b0fd947..d4effb3 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -1,383 +1,8 @@
 <!-- 计量规程 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规程', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规程')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规程',
-    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: '计量规程',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规程',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规程',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规程" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 8d0ef94..380847a 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -1,377 +1,8 @@
 <!-- 计量规章制度 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '计量规章制度', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '计量规章制度')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '计量规章制度',
-    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: '计量规章制度',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '计量规章制度',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '计量规章制度',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="计量规章制度" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 2fed3e6..1e92a0a 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -1,383 +1,8 @@
 <!-- 校验检测办法 -->
-<script lang="ts" setup>
-import { Delete } from '@element-plus/icons-vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import addDialog from './components/addDialog.vue'
-import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
-import { deleteApi, listPageApi, updateApi } from '@/api/measure/file'
-import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
-import { uploadApi } from '@/api/system/notice'
-const searchQuery = reactive<fileSearchType>({
-  fileNo: '', // 编号
-  fileName: '', // 名称
-  publishTime: '', // 发布时间
-  fileCode: '', // 文件号
-  effectiveTime: '', // 实施时间
-  effectiveStatus: '', // 实施状态
-  limit: 10,
-  offset: 1,
-  fileType: '', // 类型
-}) // 查询参数
-const loadingTable = ref<boolean>(false) // 表格loading
-const total = ref<number>(0) // 数据总条数
-const columns = ref([
-  { text: '名称', value: 'fileName', align: 'center' },
-  { text: '编号', value: 'fileNo', align: 'center' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '类别', value: 'fileType', align: 'center' },
-  { text: '发布时间', value: 'publishTime', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center' },
-  { text: '实施状态', value: 'effectiveStatus', align: 'center' },
-]) // 表格
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '校验检测办法', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
-  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
-  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
-  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
-  standard: '',
-  extarCss: '',
-})
-const list = ref([]) // 表格数据
-const addRef = ref() // 添加/编辑/详情/组件
-// 获取类型
-const fileTypeList = ref<fileResType[]>([])
-const getType = async () => {
-  const res = await getDictByCode('fileType')
-  fileTypeList.value = res.data
-  searchQuery.fileType = res.data.filter((item: fileResType) => item.name === '校验检测办法')[0].value
-}
-const effectiveStatusSelect = ref<fileResType[]>([])
-// 获取实施状态
-const getStatus = () => {
-  getDictByCode('effectiveStatus').then((res) => {
-    if (res.code === 200) {
-      effectiveStatusSelect.value = res.data
-    }
-  })
-}
-// 获取数据列表
-const getList = () => {
-  loadingTable.value = true
-  listPageApi(searchQuery).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows
-      total.value = res.data.total
-    }
-    loadingTable.value = false
-  }).catch((_) => {
-    loadingTable.value = false
-  })
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    searchQuery.limit = val.size
-  }
-  if (val && val.page) {
-    searchQuery.offset = val.page
-  }
-  getList()
-}
-// 详情
-const detail = (row: fileListType) => {
-  addRef.value.initDialog({
-    ...row,
-    fileType: searchQuery.fileType,
-    fileTypeName: '校验检测办法',
-    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: '校验检测办法',
-    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 remove = (row: fileListType) => {
-  ElMessageBox.confirm(
-    `确认删除${row.fileName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      deleteApi({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          getList()
-        }
-      })
-    })
-}
-// 搜索
-const search = () => {
-  getList()
-}
-// 重置
-const reset = () => {
-  searchQuery.fileNo = ''
-  searchQuery.fileName = ''
-  searchQuery.fileCode = ''
-  searchQuery.publishTime = ''
-  searchQuery.effectiveTime = ''
-  searchQuery.effectiveStatus = ''
-  getList()
-}
-// 模板下载
-const templateDownload = () => {
-
-}
-// 新增
-const add = () => {
-  addRef.value.initDialog({
-    fileType: searchQuery.fileType,
-    title: '新增',
-    fileTypeName: '校验检测办法',
-  })
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  listPageApi({ ...searchQuery, limit: 9999999, offset: 1 }).then((res) => {
-    if (res.code === 200) {
-      if (res.data.rows.length) {
-        exportExcel({
-          json: res.data.rows.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: '校验检测办法',
-          titleArr: ['序号', '名称', '编号', '文件号', '类别', '发布时间', '实施时间', '实施状态'],
-          sheetName: 'sheet1',
-        })
-      }
-      else {
-        ElMessage({
-          type: 'warning',
-          message: '暂无数据',
-        })
-      }
-    }
-    loading.close()
-  }).catch((_) => {
-    loading.close()
-  })
-}
-// 打印
-const print = () => {
-
-}
-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()
-}
-onMounted(() => {
-  getStatus()
-  getType().then((_) => {
-    getList()
-  })
-})
+<script lang="ts" setup name="CNASfile">
+import templatePag from './components/templatePage.vue'
 </script>
 
 <template>
-  <!-- 布局 -->
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area @search="search">
-      <search-item>
-        <el-input v-model="searchQuery.fileNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileName" placeholder="名称" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
-          <el-option
-            v-for="item in fileTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="searchQuery.publishTime" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-          placeholder="发布时间"
-          class="normal-date"
-          style="width: 130px;"
-        />
-      </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;"
-        />
-      </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>
-      </search-item>
-      <template #btns>
-        <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-          重置
-        </el-button>
-      </template>
-    </search-area>
-    <table-container>
-      <!-- 表头区域 -->
-      <template #btns-right>
-        <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-        <el-button type="primary" @click="batchImport">
-          批量导入
-        </el-button>
-        <el-button type="primary" @click="templateDownload">
-          模板下载
-        </el-button>
-        <el-button type="primary" @click="add">
-          新建
-        </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
-          导出
-        </el-button>
-        <el-button v-print="printObj" type="primary" @click="print">
-          打印
-        </el-button>
-      </template>
-      <!-- 表格区域 -->
-      <normal-table
-        id="print"
-        :data="list" :total="total" :columns="columns as any"
-        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
-        :list-loading="loadingTable"
-        @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
-            <template #default="scope">
-              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-        </template>
-        <template #columns>
-          <el-table-column label="操作" align="center" width="250">
-            <template #default="{ row }">
-              <el-button @click="detail(row)">
-                查看
-              </el-button>
-              <el-button @click="exportSelf(row)">
-                下载
-              </el-button>
-              <el-button @click="abolish(row)">
-                废止
-              </el-button>
-              <el-button @click="remove(row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-    <add-dialog ref="addRef" @reset-data="getList" />
-  </app-container>
+  <template-pag name="校验检测办法" />
 </template>
-
-<style lang="scss" scoped>
-.normal-input {
-  width: 130px !important;
-}
-
-.normal-date {
-  width: 130px !important;
-}
-
-.normal-select {
-  width: 130px !important;
-}
-
-:deep(.el-table__header) {
-  background-color: #bbb;
-}
-</style>
diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue
index ce72aac..e87f03b 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -115,9 +115,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getNoticeList()
 })
@@ -160,7 +177,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -177,9 +194,9 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="90">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="detail(row)">
+              <el-button type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index b123149..1c11e93 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -198,7 +198,7 @@
         >
           附件
         </el-link>
-        <input v-show="title !== '详情'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+        <input v-show="title === '123'" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
       <el-form-item>
         <el-button v-if="title === ''" type="primary" @click="submitForm(ruleFormRef)">
diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index 63058ee..ef9723d 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -64,6 +64,7 @@
     title: '更新',
   })
 }
+
 // 详情
 const detail = (row: signType) => {
   addRef.value.initDialog({
@@ -137,9 +138,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签名管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +200,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +220,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +241,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index 2d44769..aaa60ba 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '证书报告',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,16 +228,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 0643a0d..1495ac2 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -115,6 +115,15 @@
     title: '新增',
   })
 }
+// 下载
+const exportSele = (row: templateType) => {
+  exportExcel({
+    json: [row].map((item: templateType, index: number) => ({ index: index + 1, templateNo: item.templateNo, templateName: item.templateName, templateCreator: item.templateCreator, createTime: item.createTime, templateDesc: item.templateDesc })),
+    name: '原始记录',
+    titleArr: ['序号', '模板编号', '模板名称', '模板负责人', '创建时间', '描述'],
+    sheetName: 'sheet1',
+  })
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -137,9 +146,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '原始记录模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +208,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -200,18 +226,18 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column label="操作" align="center" width="300">
+          <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small">
+              <el-button size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -226,7 +252,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 001b5b3..6dc200d 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -137,9 +137,26 @@
   })
 }
 // 打印
-const print = () => {
-
-}
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '签章管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 onMounted(() => {
   getType().then((_) => {
     getList()
@@ -182,7 +199,7 @@
         <el-button type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -202,13 +219,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button @click="edit(row)">
+              <el-button size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button @click="detail(row)">
+              <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button @click="remove(row)">
+              <el-button size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
@@ -223,7 +240,6 @@
 <style lang="scss" scoped>
 .normal-input {
   width: 180px !important;
-  margin-right: 15px !important;
 }
 
 :deep(.el-table__header) {