diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index 744654f..21d9bfd 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -3,8 +3,10 @@
 <script lang="ts" setup name="MeasureDataTemplateDetail">
 import { ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IForm } from '../../measureData-interface'
 import changeRecord from '../changeRecord.vue'
+import selectStandard from '../../dialog/selectStandardDialog.vue'
 import type { IDetailMeasureList } from './first-interface'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
@@ -13,12 +15,11 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import selectStandard from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
 import { getEquipmentList } from '@/api/equipment/standard/book'
 import { useUniqueArray } from '@/utils/useUniqueArray'
 import { getInfo } from '@/api/business/taskMeasure/measureData'
 import { getInfo as getItemInfo } from '@/api/business/measure/item'
-
+import { getClassificationList } from '@/api/business/measure/classification'
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
@@ -53,7 +54,7 @@
   temperature: [{ required: true, message: '温度不能为空', trigger: ['blur', 'change'] }],
   humidity: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] }],
   orderNo: [{ required: true, message: '任务单编号不能为空', trigger: ['blur', 'change'] }],
-  technologyFile: [{ required: true, message: '依据的技术文件不能为空', trigger: ['blur', 'change'] }],
+  // technologyFile: [{ required: true, message: '依据的技术文件不能为空', trigger: ['blur', 'change'] }],
   createUserName: [{ required: true, message: '检定员不能为空', trigger: ['blur', 'change'] }],
   conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   restrictionInstruction: [{ required: true, message: '限用说明不能为空', trigger: ['blur', 'change'] }],
@@ -142,13 +143,6 @@
 
 // 用标准装置id获取标准配套设备查询条件
 const listQuery = ref({
-  equipmentNo: '', // 统一编号
-  equipmentName: '', // 设备名称
-  traceCompany: '', // 溯源单位
-  manufactureNo: '', // 出厂编号
-  directorId: '', // 负责人
-  measureValidDateEnd: '', // 检定有效期（结束）
-  measureValidDateStart: '', // 检定有效期（结束）
   standardId: '',
   offset: 1,
   limit: 999999,
@@ -304,6 +298,33 @@
   })
 }
 
+// 获取检定项分类的技术文件
+// 查询条件
+const fetchClassificationListQuery = ref({
+  belongStandardEquipment: '', // 检校标准装置
+  categoryName: '', // 检定项分类名称
+  categoryNo: '', // 检定项分类编号
+  deviceType: '', // 设备分类
+  measureCategory: '', // 检校类别
+  limit: 20,
+  offset: 1,
+})
+
+// 数据查询
+function fetchClassificationData(isNowPage = false, categoryName = '', belongStandardEquipment = '') {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  fetchClassificationListQuery.value.categoryName = categoryName // 设备分类型名称
+  fetchClassificationListQuery.value.belongStandardEquipment = belongStandardEquipment // 检校标准装置名称
+  getClassificationList(fetchClassificationListQuery.value).then((response) => {
+    if (response.data.rows.length) {
+      form.value.technologyFile = response.data.rows[0].technologyFile.split(';')
+    }
+  })
+}
+
 // ------------------------------------------钩子----------------------------------------------
 watch(() => itemCategoryName.value, (newValue) => {
   if (newValue) {
@@ -337,6 +358,9 @@
     if (pageType.value === 'add') { // 从我的任务跳转过来（新增）
       form.value.orderId = $route.query.orderId as string // 任务单id
       form.value.orderNo = $route.query.orderNo as string // 任务单编号
+      form.value.traceDate = dayjs().format('YYYY-MM-DD') // 测试校准检定日期默认今天
+      form.value.measureValidDate = `${dayjs().add(Number($route.query.checkCycle), 'month').subtract(1, 'day')}` // 检定有效期--今天 + 检定周期 - 1天
+      form.value.measureValidDate = dayjs(form.value.measureValidDate).format('YYYY-MM-DD')
       sampleList.value = [{
         sampleName: $route.query.sampleName, // 设备名称
         sampleModel: $route.query.sampleModel, // 规格型号
@@ -346,6 +370,8 @@
       }]
       console.log('$route.query.itemId', $route.query.itemId)
       itemCategoryName.value = $route.query.itemCategoryName as string // 设备检定项分类名称
+      // 新增时查依据的技术文件（编号、名称）
+      fetchClassificationData(false, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
       // 新增的时候查输入值
       fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipmentName as string)
     }
@@ -479,22 +505,16 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="24" class="marg">
+      <el-row :gutter="24" class="marg">
         <el-col :span="24">
-          <el-form-item label="依据的技术文件:" prop="technologyFileArr">
-            <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-              {{ !form.technologyFileArr.length ? '上传' : '上传' }}
-            </el-button>
-            <div v-for="(item, index) in form.technologyFileArr" :key="index" style="display: flex;">
-              <show-photo :minio-file-name="item">
-                <span v-if="pageType !== 'detail'" class="photo-close" @click="delFile(index)">×</span>
-              </show-photo>
+          <el-form-item label="依据的技术文件:" prop="technologyFile">
+            <div v-for="(item, index) in form.technologyFile" :key="index" style="display: flex;">
+              <show-photo :minio-file-name="item" />
             </div>
-            <span v-if="pageType === 'detail' && !form.technologyFileArr.length">无</span>
-            <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            <span v-if="pageType === 'detail' && !form.technologyFile.length">无</span>
           </el-form-item>
         </el-col>
-      </el-row> -->
+      </el-row>
     </el-form>
   </detail-block>
   <!-- 被检件信息 -->

diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index 744654f..21d9bfd 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -3,8 +3,10 @@
 <script lang="ts" setup name="MeasureDataTemplateDetail">
 import { ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IForm } from '../../measureData-interface'
 import changeRecord from '../changeRecord.vue'
+import selectStandard from '../../dialog/selectStandardDialog.vue'
 import type { IDetailMeasureList } from './first-interface'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
@@ -13,12 +15,11 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import selectStandard from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
 import { getEquipmentList } from '@/api/equipment/standard/book'
 import { useUniqueArray } from '@/utils/useUniqueArray'
 import { getInfo } from '@/api/business/taskMeasure/measureData'
 import { getInfo as getItemInfo } from '@/api/business/measure/item'
-
+import { getClassificationList } from '@/api/business/measure/classification'
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
@@ -53,7 +54,7 @@
   temperature: [{ required: true, message: '温度不能为空', trigger: ['blur', 'change'] }],
   humidity: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] }],
   orderNo: [{ required: true, message: '任务单编号不能为空', trigger: ['blur', 'change'] }],
-  technologyFile: [{ required: true, message: '依据的技术文件不能为空', trigger: ['blur', 'change'] }],
+  // technologyFile: [{ required: true, message: '依据的技术文件不能为空', trigger: ['blur', 'change'] }],
   createUserName: [{ required: true, message: '检定员不能为空', trigger: ['blur', 'change'] }],
   conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   restrictionInstruction: [{ required: true, message: '限用说明不能为空', trigger: ['blur', 'change'] }],
@@ -142,13 +143,6 @@
 
 // 用标准装置id获取标准配套设备查询条件
 const listQuery = ref({
-  equipmentNo: '', // 统一编号
-  equipmentName: '', // 设备名称
-  traceCompany: '', // 溯源单位
-  manufactureNo: '', // 出厂编号
-  directorId: '', // 负责人
-  measureValidDateEnd: '', // 检定有效期（结束）
-  measureValidDateStart: '', // 检定有效期（结束）
   standardId: '',
   offset: 1,
   limit: 999999,
@@ -304,6 +298,33 @@
   })
 }
 
+// 获取检定项分类的技术文件
+// 查询条件
+const fetchClassificationListQuery = ref({
+  belongStandardEquipment: '', // 检校标准装置
+  categoryName: '', // 检定项分类名称
+  categoryNo: '', // 检定项分类编号
+  deviceType: '', // 设备分类
+  measureCategory: '', // 检校类别
+  limit: 20,
+  offset: 1,
+})
+
+// 数据查询
+function fetchClassificationData(isNowPage = false, categoryName = '', belongStandardEquipment = '') {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  fetchClassificationListQuery.value.categoryName = categoryName // 设备分类型名称
+  fetchClassificationListQuery.value.belongStandardEquipment = belongStandardEquipment // 检校标准装置名称
+  getClassificationList(fetchClassificationListQuery.value).then((response) => {
+    if (response.data.rows.length) {
+      form.value.technologyFile = response.data.rows[0].technologyFile.split(';')
+    }
+  })
+}
+
 // ------------------------------------------钩子----------------------------------------------
 watch(() => itemCategoryName.value, (newValue) => {
   if (newValue) {
@@ -337,6 +358,9 @@
     if (pageType.value === 'add') { // 从我的任务跳转过来（新增）
       form.value.orderId = $route.query.orderId as string // 任务单id
       form.value.orderNo = $route.query.orderNo as string // 任务单编号
+      form.value.traceDate = dayjs().format('YYYY-MM-DD') // 测试校准检定日期默认今天
+      form.value.measureValidDate = `${dayjs().add(Number($route.query.checkCycle), 'month').subtract(1, 'day')}` // 检定有效期--今天 + 检定周期 - 1天
+      form.value.measureValidDate = dayjs(form.value.measureValidDate).format('YYYY-MM-DD')
       sampleList.value = [{
         sampleName: $route.query.sampleName, // 设备名称
         sampleModel: $route.query.sampleModel, // 规格型号
@@ -346,6 +370,8 @@
       }]
       console.log('$route.query.itemId', $route.query.itemId)
       itemCategoryName.value = $route.query.itemCategoryName as string // 设备检定项分类名称
+      // 新增时查依据的技术文件（编号、名称）
+      fetchClassificationData(false, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
       // 新增的时候查输入值
       fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipmentName as string)
     }
@@ -479,22 +505,16 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="24" class="marg">
+      <el-row :gutter="24" class="marg">
         <el-col :span="24">
-          <el-form-item label="依据的技术文件:" prop="technologyFileArr">
-            <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-              {{ !form.technologyFileArr.length ? '上传' : '上传' }}
-            </el-button>
-            <div v-for="(item, index) in form.technologyFileArr" :key="index" style="display: flex;">
-              <show-photo :minio-file-name="item">
-                <span v-if="pageType !== 'detail'" class="photo-close" @click="delFile(index)">×</span>
-              </show-photo>
+          <el-form-item label="依据的技术文件:" prop="technologyFile">
+            <div v-for="(item, index) in form.technologyFile" :key="index" style="display: flex;">
+              <show-photo :minio-file-name="item" />
             </div>
-            <span v-if="pageType === 'detail' && !form.technologyFileArr.length">无</span>
-            <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            <span v-if="pageType === 'detail' && !form.technologyFile.length">无</span>
           </el-form-item>
         </el-col>
-      </el-row> -->
+      </el-row>
     </el-form>
   </detail-block>
   <!-- 被检件信息 -->
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
new file mode 100644
index 0000000..678ca23
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -0,0 +1,211 @@
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="SelectStandardDialog">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getStandardList } from '@/api/equipment/standard/book'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getStaffList } from '@/api/resource/register'
+import { toTreeList } from '@/utils/structure'
+import type { deptType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const props = defineProps({
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false, // 默认单选
+  },
+})
+// 用户信息
+const emits = defineEmits(['confirm'])
+const user = useUserStore()
+const dialogFormVisible = ref(false)
+const standardId = ref('') // 标准装置id
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '0', // 审批状态
+  deptId: '', // 部门id
+  // deptId: user.deptId, // 部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
+  standardName: '', // 标准装置名称
+  storageLocation: '', // 存放地点
+  technologyFileName: '', // 依据的技术文件
+  offset: 1,
+  limit: props.isMulti ? 5 : 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '标准代码', value: 'standardNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '存放地点', value: 'storageLocationName', align: 'center' },
+  { text: '测量范围', value: 'measureRange', align: 'center' },
+  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
+  { text: '建标日期', value: 'date', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+// -----------------------------------------字典--------------------------------------------------------------
+const storageLocationList = ref({}) as any // 存放地点{1: 新建}
+// 查询字典
+const getDict = async () => {
+  // 存放地点
+  getDictByCode('bizStorageLocation').then((response) => {
+    storageLocationList.value = response.data
+  })
+}
+// --------------------------------------------------------------------------------------------
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { lastReviewDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        lastReviewDate: item.lastReviewDate ? dayjs(item.lastReviewDate).format('YYYY-MM-DD') : item.lastReviewDate, // 最近复查日期
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', // 审批状态
+    deptId: user.deptId, // 部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
+    standardName: '', // 标准装置名称
+    storageLocation: '', // 存放地点
+    technologyFileName: '', // 依据的技术文件
+    offset: 1,
+    limit: props.isMulti ? 5 : 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择设备')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = async (id: string) => {
+  await getDict()
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择标准装置" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model.trim="listQuery.standardName" placeholder="标准装置名称" class="short-input" clearable />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.storageLocation"
+            placeholder="存放地点"
+            class="short-input"
+            filterable
+          >
+            <el-option v-for="item in storageLocationList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+        <!-- <search-item>
+          <el-input v-model.trim="listQuery.technologyFileName" placeholder="依据的技术文件" class="short-input" clearable />
+        </search-item> -->
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMulti"
+        :height="260"
+        :page-sizes="props.isMulti ? [5] : [20]"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
index 744654f..21d9bfd 100644
--- a/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/first/templateDetail.vue
@@ -3,8 +3,10 @@
 <script lang="ts" setup name="MeasureDataTemplateDetail">
 import { ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IForm } from '../../measureData-interface'
 import changeRecord from '../changeRecord.vue'
+import selectStandard from '../../dialog/selectStandardDialog.vue'
 import type { IDetailMeasureList } from './first-interface'
 import { getUserList } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
@@ -13,12 +15,11 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import selectStandard from '@/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue'
 import { getEquipmentList } from '@/api/equipment/standard/book'
 import { useUniqueArray } from '@/utils/useUniqueArray'
 import { getInfo } from '@/api/business/taskMeasure/measureData'
 import { getInfo as getItemInfo } from '@/api/business/measure/item'
-
+import { getClassificationList } from '@/api/business/measure/classification'
 const user = useUserStore() // 用户信息
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
@@ -53,7 +54,7 @@
   temperature: [{ required: true, message: '温度不能为空', trigger: ['blur', 'change'] }],
   humidity: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] }],
   orderNo: [{ required: true, message: '任务单编号不能为空', trigger: ['blur', 'change'] }],
-  technologyFile: [{ required: true, message: '依据的技术文件不能为空', trigger: ['blur', 'change'] }],
+  // technologyFile: [{ required: true, message: '依据的技术文件不能为空', trigger: ['blur', 'change'] }],
   createUserName: [{ required: true, message: '检定员不能为空', trigger: ['blur', 'change'] }],
   conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   restrictionInstruction: [{ required: true, message: '限用说明不能为空', trigger: ['blur', 'change'] }],
@@ -142,13 +143,6 @@
 
 // 用标准装置id获取标准配套设备查询条件
 const listQuery = ref({
-  equipmentNo: '', // 统一编号
-  equipmentName: '', // 设备名称
-  traceCompany: '', // 溯源单位
-  manufactureNo: '', // 出厂编号
-  directorId: '', // 负责人
-  measureValidDateEnd: '', // 检定有效期（结束）
-  measureValidDateStart: '', // 检定有效期（结束）
   standardId: '',
   offset: 1,
   limit: 999999,
@@ -304,6 +298,33 @@
   })
 }
 
+// 获取检定项分类的技术文件
+// 查询条件
+const fetchClassificationListQuery = ref({
+  belongStandardEquipment: '', // 检校标准装置
+  categoryName: '', // 检定项分类名称
+  categoryNo: '', // 检定项分类编号
+  deviceType: '', // 设备分类
+  measureCategory: '', // 检校类别
+  limit: 20,
+  offset: 1,
+})
+
+// 数据查询
+function fetchClassificationData(isNowPage = false, categoryName = '', belongStandardEquipment = '') {
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  fetchClassificationListQuery.value.categoryName = categoryName // 设备分类型名称
+  fetchClassificationListQuery.value.belongStandardEquipment = belongStandardEquipment // 检校标准装置名称
+  getClassificationList(fetchClassificationListQuery.value).then((response) => {
+    if (response.data.rows.length) {
+      form.value.technologyFile = response.data.rows[0].technologyFile.split(';')
+    }
+  })
+}
+
 // ------------------------------------------钩子----------------------------------------------
 watch(() => itemCategoryName.value, (newValue) => {
   if (newValue) {
@@ -337,6 +358,9 @@
     if (pageType.value === 'add') { // 从我的任务跳转过来（新增）
       form.value.orderId = $route.query.orderId as string // 任务单id
       form.value.orderNo = $route.query.orderNo as string // 任务单编号
+      form.value.traceDate = dayjs().format('YYYY-MM-DD') // 测试校准检定日期默认今天
+      form.value.measureValidDate = `${dayjs().add(Number($route.query.checkCycle), 'month').subtract(1, 'day')}` // 检定有效期--今天 + 检定周期 - 1天
+      form.value.measureValidDate = dayjs(form.value.measureValidDate).format('YYYY-MM-DD')
       sampleList.value = [{
         sampleName: $route.query.sampleName, // 设备名称
         sampleModel: $route.query.sampleModel, // 规格型号
@@ -346,6 +370,8 @@
       }]
       console.log('$route.query.itemId', $route.query.itemId)
       itemCategoryName.value = $route.query.itemCategoryName as string // 设备检定项分类名称
+      // 新增时查依据的技术文件（编号、名称）
+      fetchClassificationData(false, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string)
       // 新增的时候查输入值
       fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipmentName as string)
     }
@@ -479,22 +505,16 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- <el-row :gutter="24" class="marg">
+      <el-row :gutter="24" class="marg">
         <el-col :span="24">
-          <el-form-item label="依据的技术文件:" prop="technologyFileArr">
-            <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-right': '20px' }" @click="upload">
-              {{ !form.technologyFileArr.length ? '上传' : '上传' }}
-            </el-button>
-            <div v-for="(item, index) in form.technologyFileArr" :key="index" style="display: flex;">
-              <show-photo :minio-file-name="item">
-                <span v-if="pageType !== 'detail'" class="photo-close" @click="delFile(index)">×</span>
-              </show-photo>
+          <el-form-item label="依据的技术文件:" prop="technologyFile">
+            <div v-for="(item, index) in form.technologyFile" :key="index" style="display: flex;">
+              <show-photo :minio-file-name="item" />
             </div>
-            <span v-if="pageType === 'detail' && !form.technologyFileArr.length">无</span>
-            <input v-show="pageType === ''" ref="fileRef" type="file" name="upload" multiple @change="onFileChange">
+            <span v-if="pageType === 'detail' && !form.technologyFile.length">无</span>
           </el-form-item>
         </el-col>
-      </el-row> -->
+      </el-row>
     </el-form>
   </detail-block>
   <!-- 被检件信息 -->
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
new file mode 100644
index 0000000..678ca23
--- /dev/null
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -0,0 +1,211 @@
+<!-- 选择标准装置 -->
+<script lang="ts" setup name="SelectStandardDialog">
+import { ElMessage } from 'element-plus'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { DateModelType } from 'element-plus'
+import { getStandardList } from '@/api/equipment/standard/book'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getStaffList } from '@/api/resource/register'
+import { toTreeList } from '@/utils/structure'
+import type { deptType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const props = defineProps({
+  isMulti: { // 是否多选
+    type: Boolean,
+    default: false, // 默认单选
+  },
+})
+// 用户信息
+const emits = defineEmits(['confirm'])
+const user = useUserStore()
+const dialogFormVisible = ref(false)
+const standardId = ref('') // 标准装置id
+// 查询条件
+const listQuery = ref({
+  approvalStatus: '0', // 审批状态
+  deptId: '', // 部门id
+  // deptId: user.deptId, // 部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
+  standardName: '', // 标准装置名称
+  storageLocation: '', // 存放地点
+  technologyFileName: '', // 依据的技术文件
+  offset: 1,
+  limit: props.isMulti ? 5 : 20,
+})
+// 多选选中的内容
+const checkoutList = ref([])
+const loadingTable = ref(false)
+const list = ref([]) // 表格数据
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '标准代码', value: 'standardNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '存放地点', value: 'storageLocationName', align: 'center' },
+  { text: '测量范围', value: 'measureRange', align: 'center' },
+  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
+  { text: '建标日期', value: 'date', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+])
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+
+// -----------------------------------------字典--------------------------------------------------------------
+const storageLocationList = ref({}) as any // 存放地点{1: 新建}
+// 查询字典
+const getDict = async () => {
+  // 存放地点
+  getDictByCode('bizStorageLocation').then((response) => {
+    storageLocationList.value = response.data
+  })
+}
+// --------------------------------------------------------------------------------------------
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getStandardList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: { lastReviewDate: string; agreementAmount: number }) => {
+      return {
+        ...item,
+        lastReviewDate: item.lastReviewDate ? dayjs(item.lastReviewDate).format('YYYY-MM-DD') : item.lastReviewDate, // 最近复查日期
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', // 审批状态
+    deptId: user.deptId, // 部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
+    standardName: '', // 标准装置名称
+    storageLocation: '', // 存放地点
+    technologyFileName: '', // 依据的技术文件
+    offset: 1,
+    limit: props.isMulti ? 5 : 20,
+  }
+  dateRange.value = ['', '']
+  fetchData()
+}
+// 搜索
+const search = () => {
+  fetchData(true)
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击确定
+const confirmSelect = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择设备')
+  }
+  else {
+    emits('confirm', checkoutList.value)
+    dialogFormVisible.value = false
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+// 初始化
+const initDialog = async (id: string) => {
+  await getDict()
+  dialogFormVisible.value = true
+  fetchData()
+}
+
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择标准装置" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model.trim="listQuery.standardName" placeholder="标准装置名称" class="short-input" clearable />
+      </search-item>
+      <search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.storageLocation"
+            placeholder="存放地点"
+            class="short-input"
+            filterable
+          >
+            <el-option v-for="item in storageLocationList" :key="item.id" :label="item.name" :value="item.value" />
+          </el-select>
+        </search-item>
+        <!-- <search-item>
+          <el-input v-model.trim="listQuery.technologyFileName" placeholder="依据的技术文件" class="short-input" clearable />
+        </search-item> -->
+      </search-item>
+    </search-area>
+
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="props.isMulti"
+        :height="260"
+        :page-sizes="props.isMulti ? [5] : [20]"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/taskMeasure/myTask/list.vue b/src/views/business/taskMeasure/myTask/list.vue
index 18fdf30..c565a65 100644
--- a/src/views/business/taskMeasure/myTask/list.vue
+++ b/src/views/business/taskMeasure/myTask/list.vue
@@ -268,6 +268,7 @@
             itemCategoryName: fetchItemList.value[0].itemCategoryName, // 检定项分类名称
             belongStandardEquipment: fetchItemList.value[0].belongStandardEquipment, // 检校标准装置Code
             belongStandardEquipmentName: fetchItemList.value[0].belongStandardEquipmentName, // 检校标准装置名称
+            checkCycle: fetchItemList.value[0].checkCycle, // 检定周期
           },
         })
       }