diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 53c3b17..a14ce57 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -17,6 +17,7 @@
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -40,6 +41,7 @@
   approvalType: '', // 申请审批类型(1新增2编辑3删除)
   approvalTypeName: '', // 申请审批类型名称
   attachments: [], // 主附件信息列表
+  taskInfos: [], // 参试任务
   category: '', // 设备分类(字典code)
   certificateValid: '', // 证书有效期
   checkCycle: '', // 检定周期(月)
@@ -80,6 +82,7 @@
   usageStatus: '', // 使用状态(字典code)
   usePosition: '', // 使用岗位
   useSign: '', // 在用信息(字典code)
+  helpInstruction: '', // 辅助字段
   companyName: '',
   certificateList: [],
 }) // 表单
@@ -93,7 +96,6 @@
   testTask.value.push('')
 }
 const radio = ref('基本信息')
-console.log($route, 'route')
 // 表单1验证规则
 const rules1 = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -103,10 +105,11 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
-  unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
+  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
   model: [{ required: true, message: '型号规格必填', trigger: ['blur', 'change'] }],
+  helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
   deptId: [{ required: true, message: '使用部门必选', trigger: ['blur', 'change'] }],
   category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
@@ -129,6 +132,13 @@
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
 const fetchSelectData = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
@@ -145,8 +155,54 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter((item: any) => item.helpInstruction)
+  })
 }
 fetchSelectData()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => ruleForm.value.equipmentName, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    ruleForm.value.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => ruleForm.value.model, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+// 设备相关，填充数据
+watch(() => ruleForm.value, (newVal) => {
+  if (ruleForm.value.helpInstruction && ruleForm.value.model && ruleForm.value.equipmentName) {
+    console.log('自动')
+    const arr = allList.value.filter((item: any) => item.helpInstruction === ruleForm.value.helpInstruction && item.model === ruleForm.value.model && item.equipmentName === ruleForm.value.equipmentName)
+    if (arr.length) {
+      const data = arr[0]
+      ruleForm.value.category = data.category
+      ruleForm.value.remark = data.remark
+      ruleForm.value.technicalTargetList = data.technicalTargetList
+      ruleForm.value.checkCycle = data.checkCycle
+    }
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 // 加载组织机构树形下拉
 const deptTreeList = ref()
 const fetchDeptTree = () => {
@@ -186,17 +242,17 @@
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         console.log(res.data, 'res.data')
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
         if ($route.params.type === 'update') {
           ruleForm.value.approvalType = '2'
           ruleForm.value.approvalTypeName = '编辑设备'
@@ -211,17 +267,17 @@
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
       })
       // ruleForm.value = JSON.parse($route.query.row as string)
     }
@@ -410,6 +466,23 @@
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
 }
+// 删除参试任务
+const delHandler = (row: any) => {
+  // ruleForm.taskInfos
+  console.log(row, 'row')
+  ElMessageBox.confirm(
+    `确认删除${row.taskName}吗?`,
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    ruleForm.value.taskInfos = ruleForm.value.taskInfos.filter((item: any) => item.id !== row.id)
+    ElMessage.success('操作成功')
+  })
+}
 const print = () => {
 
 }
@@ -483,29 +556,34 @@
         >
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="统一编号">
-                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="设备名称" prop="equipmentName">
-                <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="使用状态" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
-                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.equipmentName" placeholder="设备名称" clearable style="width: 100%;">
+                  <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="重要等级" prop="level">
-                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
-                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="型号规格" prop="model">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.model" placeholder="型号规格" clearable style="width: 100%;">
+                  <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="辅助字段" prop="helpInstruction">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" clearable style="width: 100%;">
+                  <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号" prop="manufactureNo">
+                <el-input v-model.trim="ruleForm.manufactureNo" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -519,11 +597,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="出厂编号" prop="manufactureNo">
-                <el-input v-model.trim="ruleForm.manufactureNo" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="生产日期" prop="productDate">
                 <el-date-picker
                   v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
@@ -531,6 +604,14 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="购进日期" prop="purchaseDate">
+                <el-date-picker
+                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -543,30 +624,29 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="购进日期" prop="purchaseDate">
-                <el-date-picker
-                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="使用状态" prop="usageStatus">
+                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
+                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="型号规格" prop="model">
                 <el-input v-model.trim="ruleForm.model" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="质量状况" prop="qualityCondition">
                 <el-input v-model.trim="ruleForm.qualityCondition" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="所在单位" prop="companyId">
                 <el-input v-model.trim="ruleForm.companyName" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用部门" prop="deptId">
                 <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
@@ -574,20 +654,27 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备分类" prop="category">
-                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;">
+                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;" disabled>
                   <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期" prop="checkCycle">
-                <el-input v-model.trim="ruleForm.checkCycle">
+                <el-input v-model.trim="ruleForm.checkCycle" disabled>
                   <template #append>
                     月
                   </template>
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="重要等级" prop="level">
+                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
+                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
@@ -595,6 +682,11 @@
                 <el-input v-model.trim="ruleForm.remark" />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="统一编号">
+                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="24">
@@ -645,9 +737,6 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
-        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
-      </detail-block-com>
-      <detail-block-com>
         <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -679,11 +768,10 @@
             </el-col>
           </el-row>
           <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="2">
-              <el-form-item label="组别信息" prop="groupInfos" />
-            </el-col>
-            <el-col v-for="(item, index) in ruleForm.groupInfos" :key="index" :span="3.5">
-              <el-input v-model.trim="item.groupName" disabled />
+            <el-col :span="24">
+              <el-form-item label="组别信息" prop="groupInfos">
+                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
@@ -696,7 +784,7 @@
               <el-input v-model.trim="ruleForm.installLocationExt" />
             </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <!-- <el-row :gutter="24" class="marg">
             <el-col :span="2">
               <el-form-item label="参试任务" prop="fileNo" />
             </el-col>
@@ -706,8 +794,30 @@
             <el-col v-if="dialogStatus !== 'detail'" :span="1">
               <icon-button icon="icon-add" title="" @click="addTask" />
             </el-col>
+          </el-row> -->
+          <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
+            <el-col :span="18">
+              <el-form-item label="参试任务" prop="fileNo">
+                <el-table :data="ruleForm.taskInfos">
+                  <el-table-column label="任务名称" prop="taskName" />
+                  <el-table-column label="开始时间" prop="startTime" />
+                  <el-table-column label="结束时间" prop="taskName" />
+                  <el-table-column label="备注" prop="remark" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                    <template #default=" scope ">
+                      <el-button
+                        link type="danger" size="small"
+                        @click="delHandler(scope.row)"
+                      >
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <el-row :gutter="24" class="marg" style="margin-top: 15px;">
             <el-col :span="12">
               <el-form-item label="备注" prop="remarkExt">
                 <el-input v-model.trim="ruleForm.remarkExt" />
@@ -717,6 +827,9 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
+        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
+      </detail-block-com>
+      <detail-block-com>
         <table-list ref="tableRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
       </detail-block-com>
     </div>
@@ -739,6 +852,6 @@
 }
 
 .margin {
-  padding: 10px 10px;
+  padding: 10px;
 }
 </style>

diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 53c3b17..a14ce57 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -17,6 +17,7 @@
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -40,6 +41,7 @@
   approvalType: '', // 申请审批类型(1新增2编辑3删除)
   approvalTypeName: '', // 申请审批类型名称
   attachments: [], // 主附件信息列表
+  taskInfos: [], // 参试任务
   category: '', // 设备分类(字典code)
   certificateValid: '', // 证书有效期
   checkCycle: '', // 检定周期(月)
@@ -80,6 +82,7 @@
   usageStatus: '', // 使用状态(字典code)
   usePosition: '', // 使用岗位
   useSign: '', // 在用信息(字典code)
+  helpInstruction: '', // 辅助字段
   companyName: '',
   certificateList: [],
 }) // 表单
@@ -93,7 +96,6 @@
   testTask.value.push('')
 }
 const radio = ref('基本信息')
-console.log($route, 'route')
 // 表单1验证规则
 const rules1 = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -103,10 +105,11 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
-  unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
+  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
   model: [{ required: true, message: '型号规格必填', trigger: ['blur', 'change'] }],
+  helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
   deptId: [{ required: true, message: '使用部门必选', trigger: ['blur', 'change'] }],
   category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
@@ -129,6 +132,13 @@
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
 const fetchSelectData = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
@@ -145,8 +155,54 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter((item: any) => item.helpInstruction)
+  })
 }
 fetchSelectData()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => ruleForm.value.equipmentName, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    ruleForm.value.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => ruleForm.value.model, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+// 设备相关，填充数据
+watch(() => ruleForm.value, (newVal) => {
+  if (ruleForm.value.helpInstruction && ruleForm.value.model && ruleForm.value.equipmentName) {
+    console.log('自动')
+    const arr = allList.value.filter((item: any) => item.helpInstruction === ruleForm.value.helpInstruction && item.model === ruleForm.value.model && item.equipmentName === ruleForm.value.equipmentName)
+    if (arr.length) {
+      const data = arr[0]
+      ruleForm.value.category = data.category
+      ruleForm.value.remark = data.remark
+      ruleForm.value.technicalTargetList = data.technicalTargetList
+      ruleForm.value.checkCycle = data.checkCycle
+    }
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 // 加载组织机构树形下拉
 const deptTreeList = ref()
 const fetchDeptTree = () => {
@@ -186,17 +242,17 @@
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         console.log(res.data, 'res.data')
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
         if ($route.params.type === 'update') {
           ruleForm.value.approvalType = '2'
           ruleForm.value.approvalTypeName = '编辑设备'
@@ -211,17 +267,17 @@
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
       })
       // ruleForm.value = JSON.parse($route.query.row as string)
     }
@@ -410,6 +466,23 @@
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
 }
+// 删除参试任务
+const delHandler = (row: any) => {
+  // ruleForm.taskInfos
+  console.log(row, 'row')
+  ElMessageBox.confirm(
+    `确认删除${row.taskName}吗?`,
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    ruleForm.value.taskInfos = ruleForm.value.taskInfos.filter((item: any) => item.id !== row.id)
+    ElMessage.success('操作成功')
+  })
+}
 const print = () => {
 
 }
@@ -483,29 +556,34 @@
         >
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="统一编号">
-                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="设备名称" prop="equipmentName">
-                <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="使用状态" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
-                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.equipmentName" placeholder="设备名称" clearable style="width: 100%;">
+                  <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="重要等级" prop="level">
-                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
-                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="型号规格" prop="model">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.model" placeholder="型号规格" clearable style="width: 100%;">
+                  <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="辅助字段" prop="helpInstruction">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" clearable style="width: 100%;">
+                  <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号" prop="manufactureNo">
+                <el-input v-model.trim="ruleForm.manufactureNo" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -519,11 +597,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="出厂编号" prop="manufactureNo">
-                <el-input v-model.trim="ruleForm.manufactureNo" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="生产日期" prop="productDate">
                 <el-date-picker
                   v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
@@ -531,6 +604,14 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="购进日期" prop="purchaseDate">
+                <el-date-picker
+                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -543,30 +624,29 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="购进日期" prop="purchaseDate">
-                <el-date-picker
-                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="使用状态" prop="usageStatus">
+                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
+                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="型号规格" prop="model">
                 <el-input v-model.trim="ruleForm.model" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="质量状况" prop="qualityCondition">
                 <el-input v-model.trim="ruleForm.qualityCondition" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="所在单位" prop="companyId">
                 <el-input v-model.trim="ruleForm.companyName" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用部门" prop="deptId">
                 <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
@@ -574,20 +654,27 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备分类" prop="category">
-                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;">
+                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;" disabled>
                   <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期" prop="checkCycle">
-                <el-input v-model.trim="ruleForm.checkCycle">
+                <el-input v-model.trim="ruleForm.checkCycle" disabled>
                   <template #append>
                     月
                   </template>
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="重要等级" prop="level">
+                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
+                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
@@ -595,6 +682,11 @@
                 <el-input v-model.trim="ruleForm.remark" />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="统一编号">
+                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="24">
@@ -645,9 +737,6 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
-        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
-      </detail-block-com>
-      <detail-block-com>
         <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -679,11 +768,10 @@
             </el-col>
           </el-row>
           <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="2">
-              <el-form-item label="组别信息" prop="groupInfos" />
-            </el-col>
-            <el-col v-for="(item, index) in ruleForm.groupInfos" :key="index" :span="3.5">
-              <el-input v-model.trim="item.groupName" disabled />
+            <el-col :span="24">
+              <el-form-item label="组别信息" prop="groupInfos">
+                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
@@ -696,7 +784,7 @@
               <el-input v-model.trim="ruleForm.installLocationExt" />
             </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <!-- <el-row :gutter="24" class="marg">
             <el-col :span="2">
               <el-form-item label="参试任务" prop="fileNo" />
             </el-col>
@@ -706,8 +794,30 @@
             <el-col v-if="dialogStatus !== 'detail'" :span="1">
               <icon-button icon="icon-add" title="" @click="addTask" />
             </el-col>
+          </el-row> -->
+          <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
+            <el-col :span="18">
+              <el-form-item label="参试任务" prop="fileNo">
+                <el-table :data="ruleForm.taskInfos">
+                  <el-table-column label="任务名称" prop="taskName" />
+                  <el-table-column label="开始时间" prop="startTime" />
+                  <el-table-column label="结束时间" prop="taskName" />
+                  <el-table-column label="备注" prop="remark" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                    <template #default=" scope ">
+                      <el-button
+                        link type="danger" size="small"
+                        @click="delHandler(scope.row)"
+                      >
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <el-row :gutter="24" class="marg" style="margin-top: 15px;">
             <el-col :span="12">
               <el-form-item label="备注" prop="remarkExt">
                 <el-input v-model.trim="ruleForm.remarkExt" />
@@ -717,6 +827,9 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
+        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
+      </detail-block-com>
+      <detail-block-com>
         <table-list ref="tableRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
       </detail-block-com>
     </div>
@@ -739,6 +852,6 @@
 }
 
 .margin {
-  padding: 10px 10px;
+  padding: 10px;
 }
 </style>
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index fbb1f51..73bfbf4 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -12,6 +12,17 @@
   limit: number
   approvalStatus?: string
   formId?: string
+  model: string
+  manufactureNo: string
+  companyId: string
+  directorName: string
+  useSign: string
+  installLocation: string
+  taskId: string
+  checkOrganization: string
+  meterIdentify: string
+  checkDateStart: string
+  checkDateEnd: string
 }
 // 设备信息对象
 export interface IlistObjType {

diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 53c3b17..a14ce57 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -17,6 +17,7 @@
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -40,6 +41,7 @@
   approvalType: '', // 申请审批类型(1新增2编辑3删除)
   approvalTypeName: '', // 申请审批类型名称
   attachments: [], // 主附件信息列表
+  taskInfos: [], // 参试任务
   category: '', // 设备分类(字典code)
   certificateValid: '', // 证书有效期
   checkCycle: '', // 检定周期(月)
@@ -80,6 +82,7 @@
   usageStatus: '', // 使用状态(字典code)
   usePosition: '', // 使用岗位
   useSign: '', // 在用信息(字典code)
+  helpInstruction: '', // 辅助字段
   companyName: '',
   certificateList: [],
 }) // 表单
@@ -93,7 +96,6 @@
   testTask.value.push('')
 }
 const radio = ref('基本信息')
-console.log($route, 'route')
 // 表单1验证规则
 const rules1 = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -103,10 +105,11 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
-  unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
+  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
   model: [{ required: true, message: '型号规格必填', trigger: ['blur', 'change'] }],
+  helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
   deptId: [{ required: true, message: '使用部门必选', trigger: ['blur', 'change'] }],
   category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
@@ -129,6 +132,13 @@
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
 const fetchSelectData = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
@@ -145,8 +155,54 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter((item: any) => item.helpInstruction)
+  })
 }
 fetchSelectData()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => ruleForm.value.equipmentName, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    ruleForm.value.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => ruleForm.value.model, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+// 设备相关，填充数据
+watch(() => ruleForm.value, (newVal) => {
+  if (ruleForm.value.helpInstruction && ruleForm.value.model && ruleForm.value.equipmentName) {
+    console.log('自动')
+    const arr = allList.value.filter((item: any) => item.helpInstruction === ruleForm.value.helpInstruction && item.model === ruleForm.value.model && item.equipmentName === ruleForm.value.equipmentName)
+    if (arr.length) {
+      const data = arr[0]
+      ruleForm.value.category = data.category
+      ruleForm.value.remark = data.remark
+      ruleForm.value.technicalTargetList = data.technicalTargetList
+      ruleForm.value.checkCycle = data.checkCycle
+    }
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 // 加载组织机构树形下拉
 const deptTreeList = ref()
 const fetchDeptTree = () => {
@@ -186,17 +242,17 @@
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         console.log(res.data, 'res.data')
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
         if ($route.params.type === 'update') {
           ruleForm.value.approvalType = '2'
           ruleForm.value.approvalTypeName = '编辑设备'
@@ -211,17 +267,17 @@
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
       })
       // ruleForm.value = JSON.parse($route.query.row as string)
     }
@@ -410,6 +466,23 @@
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
 }
+// 删除参试任务
+const delHandler = (row: any) => {
+  // ruleForm.taskInfos
+  console.log(row, 'row')
+  ElMessageBox.confirm(
+    `确认删除${row.taskName}吗?`,
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    ruleForm.value.taskInfos = ruleForm.value.taskInfos.filter((item: any) => item.id !== row.id)
+    ElMessage.success('操作成功')
+  })
+}
 const print = () => {
 
 }
@@ -483,29 +556,34 @@
         >
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="统一编号">
-                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="设备名称" prop="equipmentName">
-                <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="使用状态" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
-                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.equipmentName" placeholder="设备名称" clearable style="width: 100%;">
+                  <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="重要等级" prop="level">
-                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
-                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="型号规格" prop="model">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.model" placeholder="型号规格" clearable style="width: 100%;">
+                  <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="辅助字段" prop="helpInstruction">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" clearable style="width: 100%;">
+                  <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号" prop="manufactureNo">
+                <el-input v-model.trim="ruleForm.manufactureNo" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -519,11 +597,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="出厂编号" prop="manufactureNo">
-                <el-input v-model.trim="ruleForm.manufactureNo" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="生产日期" prop="productDate">
                 <el-date-picker
                   v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
@@ -531,6 +604,14 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="购进日期" prop="purchaseDate">
+                <el-date-picker
+                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -543,30 +624,29 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="购进日期" prop="purchaseDate">
-                <el-date-picker
-                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="使用状态" prop="usageStatus">
+                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
+                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="型号规格" prop="model">
                 <el-input v-model.trim="ruleForm.model" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="质量状况" prop="qualityCondition">
                 <el-input v-model.trim="ruleForm.qualityCondition" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="所在单位" prop="companyId">
                 <el-input v-model.trim="ruleForm.companyName" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用部门" prop="deptId">
                 <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
@@ -574,20 +654,27 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备分类" prop="category">
-                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;">
+                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;" disabled>
                   <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期" prop="checkCycle">
-                <el-input v-model.trim="ruleForm.checkCycle">
+                <el-input v-model.trim="ruleForm.checkCycle" disabled>
                   <template #append>
                     月
                   </template>
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="重要等级" prop="level">
+                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
+                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
@@ -595,6 +682,11 @@
                 <el-input v-model.trim="ruleForm.remark" />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="统一编号">
+                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="24">
@@ -645,9 +737,6 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
-        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
-      </detail-block-com>
-      <detail-block-com>
         <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -679,11 +768,10 @@
             </el-col>
           </el-row>
           <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="2">
-              <el-form-item label="组别信息" prop="groupInfos" />
-            </el-col>
-            <el-col v-for="(item, index) in ruleForm.groupInfos" :key="index" :span="3.5">
-              <el-input v-model.trim="item.groupName" disabled />
+            <el-col :span="24">
+              <el-form-item label="组别信息" prop="groupInfos">
+                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
@@ -696,7 +784,7 @@
               <el-input v-model.trim="ruleForm.installLocationExt" />
             </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <!-- <el-row :gutter="24" class="marg">
             <el-col :span="2">
               <el-form-item label="参试任务" prop="fileNo" />
             </el-col>
@@ -706,8 +794,30 @@
             <el-col v-if="dialogStatus !== 'detail'" :span="1">
               <icon-button icon="icon-add" title="" @click="addTask" />
             </el-col>
+          </el-row> -->
+          <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
+            <el-col :span="18">
+              <el-form-item label="参试任务" prop="fileNo">
+                <el-table :data="ruleForm.taskInfos">
+                  <el-table-column label="任务名称" prop="taskName" />
+                  <el-table-column label="开始时间" prop="startTime" />
+                  <el-table-column label="结束时间" prop="taskName" />
+                  <el-table-column label="备注" prop="remark" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                    <template #default=" scope ">
+                      <el-button
+                        link type="danger" size="small"
+                        @click="delHandler(scope.row)"
+                      >
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <el-row :gutter="24" class="marg" style="margin-top: 15px;">
             <el-col :span="12">
               <el-form-item label="备注" prop="remarkExt">
                 <el-input v-model.trim="ruleForm.remarkExt" />
@@ -717,6 +827,9 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
+        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
+      </detail-block-com>
+      <detail-block-com>
         <table-list ref="tableRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
       </detail-block-com>
     </div>
@@ -739,6 +852,6 @@
 }
 
 .margin {
-  padding: 10px 10px;
+  padding: 10px;
 }
 </style>
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index fbb1f51..73bfbf4 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -12,6 +12,17 @@
   limit: number
   approvalStatus?: string
   formId?: string
+  model: string
+  manufactureNo: string
+  companyId: string
+  directorName: string
+  useSign: string
+  installLocation: string
+  taskId: string
+  checkOrganization: string
+  meterIdentify: string
+  checkDateStart: string
+  checkDateEnd: string
 }
 // 设备信息对象
 export interface IlistObjType {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2c0fc99..f962ae8 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -10,6 +10,8 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
+import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { getTaskList } from '@/api/eqpt/device/task'
 import task from '@/views/tested/device/task/index.vue'
 const $props = defineProps({
   statusName: {
@@ -45,6 +47,17 @@
   limit: 20,
   approvalStatus: '',
   formId: SCHEDULE.DEVICE_INFO_APPROVAL,
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
+  companyId: '', // 所在单位
+  directorName: '', // 负责人
+  useSign: '', // 再用信息
+  installLocation: '', // 安装位置
+  taskId: '', // 参试任务
+  checkOrganization: '', // 检定机构
+  meterIdentify: '', // 计量标识
+  checkDateEnd: '',
+  checkDateStart: '',
 })
 const columns = ref([
   {
@@ -167,12 +180,57 @@
 }
 // 获取使用状态列表
 const useStatusList = ref()
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 再用信息
+const useSignList = ref<{ id: string; value: string; name: string }[]>([])
+// 任务列表
+const taskList = ref<{ id: string; value: string; name: string }[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 规格型号
+const modelList = ref<any[]>([])
+const allList = ref<any[]>([])
 const fetchUseStatus = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    useSignList.value = res.data
+  })
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+  })
+  // 参试任务
+  getTaskList({ limit: 9999, offset: 1 }).then((res) => {
+    taskList.value = res.data.rows.map((item: any) => ({ name: item.taskName, value: item.id, id: item.id }))
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchUseStatus()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+  }
+})
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -189,16 +247,39 @@
     listQuery.certificateValidEnd = ''
   }
 })
+const datetimerange1 = ref()
+watch(() => datetimerange1.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.checkDateStart = `${newVal[0]} 00:00:00`
+    listQuery.checkDateEnd = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.checkDateStart = ''
+    listQuery.checkDateEnd = ''
+  }
+})
 // 重置
 const reset = () => {
   datetimerange.value = []
+  datetimerange1.value = []
   listQuery.equipmentNo = ''
   listQuery.equipmentName = ''
   listQuery.usageStatus = ''
   listQuery.usePosition = ''
   listQuery.certificateValidEnd = ''
   listQuery.certificateValidStart = ''
+  listQuery.model = ''
   listQuery.deptIds = ''
+  listQuery.manufactureNo = ''
+  listQuery.companyId = ''
+  listQuery.directorName = ''
+  listQuery.useSign = ''
+  listQuery.installLocation = ''
+  listQuery.checkOrganization = ''
+  listQuery.checkDateStart = ''
+  listQuery.checkDateEnd = ''
+  listQuery.taskId = ''
+  listQuery.meterIdentify = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -589,13 +670,17 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
+        </el-select>
       </search-item>
-      <!-- <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item> -->
       <search-item>
-        <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -603,11 +688,50 @@
         </el-select>
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.taskId" placeholder="参试任务" clearable>
+          <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定(校准)开始时间" end-placeholder="检定(校准)结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
     </search-area>
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>

diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 53c3b17..a14ce57 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -17,6 +17,7 @@
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -40,6 +41,7 @@
   approvalType: '', // 申请审批类型(1新增2编辑3删除)
   approvalTypeName: '', // 申请审批类型名称
   attachments: [], // 主附件信息列表
+  taskInfos: [], // 参试任务
   category: '', // 设备分类(字典code)
   certificateValid: '', // 证书有效期
   checkCycle: '', // 检定周期(月)
@@ -80,6 +82,7 @@
   usageStatus: '', // 使用状态(字典code)
   usePosition: '', // 使用岗位
   useSign: '', // 在用信息(字典code)
+  helpInstruction: '', // 辅助字段
   companyName: '',
   certificateList: [],
 }) // 表单
@@ -93,7 +96,6 @@
   testTask.value.push('')
 }
 const radio = ref('基本信息')
-console.log($route, 'route')
 // 表单1验证规则
 const rules1 = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -103,10 +105,11 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
-  unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
+  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
   model: [{ required: true, message: '型号规格必填', trigger: ['blur', 'change'] }],
+  helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
   deptId: [{ required: true, message: '使用部门必选', trigger: ['blur', 'change'] }],
   category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
@@ -129,6 +132,13 @@
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
 const fetchSelectData = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
@@ -145,8 +155,54 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter((item: any) => item.helpInstruction)
+  })
 }
 fetchSelectData()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => ruleForm.value.equipmentName, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    ruleForm.value.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => ruleForm.value.model, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+// 设备相关，填充数据
+watch(() => ruleForm.value, (newVal) => {
+  if (ruleForm.value.helpInstruction && ruleForm.value.model && ruleForm.value.equipmentName) {
+    console.log('自动')
+    const arr = allList.value.filter((item: any) => item.helpInstruction === ruleForm.value.helpInstruction && item.model === ruleForm.value.model && item.equipmentName === ruleForm.value.equipmentName)
+    if (arr.length) {
+      const data = arr[0]
+      ruleForm.value.category = data.category
+      ruleForm.value.remark = data.remark
+      ruleForm.value.technicalTargetList = data.technicalTargetList
+      ruleForm.value.checkCycle = data.checkCycle
+    }
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 // 加载组织机构树形下拉
 const deptTreeList = ref()
 const fetchDeptTree = () => {
@@ -186,17 +242,17 @@
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         console.log(res.data, 'res.data')
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
         if ($route.params.type === 'update') {
           ruleForm.value.approvalType = '2'
           ruleForm.value.approvalTypeName = '编辑设备'
@@ -211,17 +267,17 @@
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
       })
       // ruleForm.value = JSON.parse($route.query.row as string)
     }
@@ -410,6 +466,23 @@
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
 }
+// 删除参试任务
+const delHandler = (row: any) => {
+  // ruleForm.taskInfos
+  console.log(row, 'row')
+  ElMessageBox.confirm(
+    `确认删除${row.taskName}吗?`,
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    ruleForm.value.taskInfos = ruleForm.value.taskInfos.filter((item: any) => item.id !== row.id)
+    ElMessage.success('操作成功')
+  })
+}
 const print = () => {
 
 }
@@ -483,29 +556,34 @@
         >
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="统一编号">
-                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="设备名称" prop="equipmentName">
-                <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="使用状态" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
-                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.equipmentName" placeholder="设备名称" clearable style="width: 100%;">
+                  <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="重要等级" prop="level">
-                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
-                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="型号规格" prop="model">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.model" placeholder="型号规格" clearable style="width: 100%;">
+                  <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="辅助字段" prop="helpInstruction">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" clearable style="width: 100%;">
+                  <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号" prop="manufactureNo">
+                <el-input v-model.trim="ruleForm.manufactureNo" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -519,11 +597,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="出厂编号" prop="manufactureNo">
-                <el-input v-model.trim="ruleForm.manufactureNo" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="生产日期" prop="productDate">
                 <el-date-picker
                   v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
@@ -531,6 +604,14 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="购进日期" prop="purchaseDate">
+                <el-date-picker
+                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -543,30 +624,29 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="购进日期" prop="purchaseDate">
-                <el-date-picker
-                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="使用状态" prop="usageStatus">
+                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
+                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="型号规格" prop="model">
                 <el-input v-model.trim="ruleForm.model" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="质量状况" prop="qualityCondition">
                 <el-input v-model.trim="ruleForm.qualityCondition" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="所在单位" prop="companyId">
                 <el-input v-model.trim="ruleForm.companyName" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用部门" prop="deptId">
                 <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
@@ -574,20 +654,27 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备分类" prop="category">
-                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;">
+                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;" disabled>
                   <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期" prop="checkCycle">
-                <el-input v-model.trim="ruleForm.checkCycle">
+                <el-input v-model.trim="ruleForm.checkCycle" disabled>
                   <template #append>
                     月
                   </template>
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="重要等级" prop="level">
+                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
+                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
@@ -595,6 +682,11 @@
                 <el-input v-model.trim="ruleForm.remark" />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="统一编号">
+                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="24">
@@ -645,9 +737,6 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
-        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
-      </detail-block-com>
-      <detail-block-com>
         <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -679,11 +768,10 @@
             </el-col>
           </el-row>
           <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="2">
-              <el-form-item label="组别信息" prop="groupInfos" />
-            </el-col>
-            <el-col v-for="(item, index) in ruleForm.groupInfos" :key="index" :span="3.5">
-              <el-input v-model.trim="item.groupName" disabled />
+            <el-col :span="24">
+              <el-form-item label="组别信息" prop="groupInfos">
+                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
@@ -696,7 +784,7 @@
               <el-input v-model.trim="ruleForm.installLocationExt" />
             </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <!-- <el-row :gutter="24" class="marg">
             <el-col :span="2">
               <el-form-item label="参试任务" prop="fileNo" />
             </el-col>
@@ -706,8 +794,30 @@
             <el-col v-if="dialogStatus !== 'detail'" :span="1">
               <icon-button icon="icon-add" title="" @click="addTask" />
             </el-col>
+          </el-row> -->
+          <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
+            <el-col :span="18">
+              <el-form-item label="参试任务" prop="fileNo">
+                <el-table :data="ruleForm.taskInfos">
+                  <el-table-column label="任务名称" prop="taskName" />
+                  <el-table-column label="开始时间" prop="startTime" />
+                  <el-table-column label="结束时间" prop="taskName" />
+                  <el-table-column label="备注" prop="remark" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                    <template #default=" scope ">
+                      <el-button
+                        link type="danger" size="small"
+                        @click="delHandler(scope.row)"
+                      >
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <el-row :gutter="24" class="marg" style="margin-top: 15px;">
             <el-col :span="12">
               <el-form-item label="备注" prop="remarkExt">
                 <el-input v-model.trim="ruleForm.remarkExt" />
@@ -717,6 +827,9 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
+        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
+      </detail-block-com>
+      <detail-block-com>
         <table-list ref="tableRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
       </detail-block-com>
     </div>
@@ -739,6 +852,6 @@
 }
 
 .margin {
-  padding: 10px 10px;
+  padding: 10px;
 }
 </style>
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index fbb1f51..73bfbf4 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -12,6 +12,17 @@
   limit: number
   approvalStatus?: string
   formId?: string
+  model: string
+  manufactureNo: string
+  companyId: string
+  directorName: string
+  useSign: string
+  installLocation: string
+  taskId: string
+  checkOrganization: string
+  meterIdentify: string
+  checkDateStart: string
+  checkDateEnd: string
 }
 // 设备信息对象
 export interface IlistObjType {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2c0fc99..f962ae8 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -10,6 +10,8 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
+import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { getTaskList } from '@/api/eqpt/device/task'
 import task from '@/views/tested/device/task/index.vue'
 const $props = defineProps({
   statusName: {
@@ -45,6 +47,17 @@
   limit: 20,
   approvalStatus: '',
   formId: SCHEDULE.DEVICE_INFO_APPROVAL,
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
+  companyId: '', // 所在单位
+  directorName: '', // 负责人
+  useSign: '', // 再用信息
+  installLocation: '', // 安装位置
+  taskId: '', // 参试任务
+  checkOrganization: '', // 检定机构
+  meterIdentify: '', // 计量标识
+  checkDateEnd: '',
+  checkDateStart: '',
 })
 const columns = ref([
   {
@@ -167,12 +180,57 @@
 }
 // 获取使用状态列表
 const useStatusList = ref()
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 再用信息
+const useSignList = ref<{ id: string; value: string; name: string }[]>([])
+// 任务列表
+const taskList = ref<{ id: string; value: string; name: string }[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 规格型号
+const modelList = ref<any[]>([])
+const allList = ref<any[]>([])
 const fetchUseStatus = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    useSignList.value = res.data
+  })
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+  })
+  // 参试任务
+  getTaskList({ limit: 9999, offset: 1 }).then((res) => {
+    taskList.value = res.data.rows.map((item: any) => ({ name: item.taskName, value: item.id, id: item.id }))
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchUseStatus()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+  }
+})
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -189,16 +247,39 @@
     listQuery.certificateValidEnd = ''
   }
 })
+const datetimerange1 = ref()
+watch(() => datetimerange1.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.checkDateStart = `${newVal[0]} 00:00:00`
+    listQuery.checkDateEnd = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.checkDateStart = ''
+    listQuery.checkDateEnd = ''
+  }
+})
 // 重置
 const reset = () => {
   datetimerange.value = []
+  datetimerange1.value = []
   listQuery.equipmentNo = ''
   listQuery.equipmentName = ''
   listQuery.usageStatus = ''
   listQuery.usePosition = ''
   listQuery.certificateValidEnd = ''
   listQuery.certificateValidStart = ''
+  listQuery.model = ''
   listQuery.deptIds = ''
+  listQuery.manufactureNo = ''
+  listQuery.companyId = ''
+  listQuery.directorName = ''
+  listQuery.useSign = ''
+  listQuery.installLocation = ''
+  listQuery.checkOrganization = ''
+  listQuery.checkDateStart = ''
+  listQuery.checkDateEnd = ''
+  listQuery.taskId = ''
+  listQuery.meterIdentify = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -589,13 +670,17 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
+        </el-select>
       </search-item>
-      <!-- <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item> -->
       <search-item>
-        <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -603,11 +688,50 @@
         </el-select>
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.taskId" placeholder="参试任务" clearable>
+          <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定(校准)开始时间" end-placeholder="检定(校准)结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
     </search-area>
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
diff --git a/src/views/tested/device/info/components/technology.vue b/src/views/tested/device/info/components/technology.vue
index d31fb2d..9775daf 100644
--- a/src/views/tested/device/info/components/technology.vue
+++ b/src/views/tested/device/info/components/technology.vue
@@ -89,14 +89,14 @@
 
 <template>
   <detail-block-switch title="技术指标">
-    <template v-if="!$route.path.includes('detail')" #btns>
+    <!-- <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="addRow">
         增加行
       </el-button>
       <el-button type="info" @click="removeRow">
         删除行
       </el-button>
-    </template>
+    </template> -->
     <el-table
       ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
       @row-dblclick="dblclickRow"

diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index 53c3b17..a14ce57 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -17,6 +17,7 @@
 import { uploadApi } from '@/api/system/notice'
 import useUserStore from '@/store/modules/user'
 import { getUserDept } from '@/api/system/user'
+import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
@@ -40,6 +41,7 @@
   approvalType: '', // 申请审批类型(1新增2编辑3删除)
   approvalTypeName: '', // 申请审批类型名称
   attachments: [], // 主附件信息列表
+  taskInfos: [], // 参试任务
   category: '', // 设备分类(字典code)
   certificateValid: '', // 证书有效期
   checkCycle: '', // 检定周期(月)
@@ -80,6 +82,7 @@
   usageStatus: '', // 使用状态(字典code)
   usePosition: '', // 使用岗位
   useSign: '', // 在用信息(字典code)
+  helpInstruction: '', // 辅助字段
   companyName: '',
   certificateList: [],
 }) // 表单
@@ -93,7 +96,6 @@
   testTask.value.push('')
 }
 const radio = ref('基本信息')
-console.log($route, 'route')
 // 表单1验证规则
 const rules1 = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
@@ -103,10 +105,11 @@
   productCountry: [{ required: true, message: '生产国家必填', trigger: ['blur', 'change'] }],
   manufacturer: [{ required: true, message: '生产厂家必填', trigger: ['blur', 'change'] }],
   manufactureNo: [{ required: true, message: '生产编号必填', trigger: ['blur', 'change'] }],
-  productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
-  unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
-  purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
+  // productDate: [{ required: true, message: '生产日期必选', trigger: ['blur', 'change'] }],
+  // unitPrice: [{ required: true, message: '设备单价必填', trigger: ['blur', 'change'] }],
+  // purchaseDate: [{ required: true, message: '购进日期必选', trigger: ['blur', 'change'] }],
   model: [{ required: true, message: '型号规格必填', trigger: ['blur', 'change'] }],
+  helpInstruction: [{ required: true, message: '辅助字段必选', trigger: ['blur', 'change'] }],
   qualityCondition: [{ required: true, message: '质量状况必填', trigger: ['blur', 'change'] }],
   deptId: [{ required: true, message: '使用部门必选', trigger: ['blur', 'change'] }],
   category: [{ required: true, message: '设备分类必选', trigger: ['blur', 'change'] }],
@@ -129,6 +132,13 @@
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>() // 设备分类
 const inUseList = ref<{ id: string; value: string; name: string }[]>() // 设备在用信息
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>() // 计量标识
+// 设备名称
+const deviceNameList = ref<string[]>([])
+// 规格型号
+const modelList = ref<any[]>([])
+// 辅助字段
+const helpList = ref<any[]>([])
+const allList = ref<any[]>([])
 const fetchSelectData = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
@@ -145,8 +155,54 @@
   getDictByCode('eqptMeterIdentify').then((res) => {
     meterIdentifyList.value = res.data
   })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号及辅助字段
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+    helpList.value = res.data.filter((item: any) => item.helpInstruction)
+  })
 }
 fetchSelectData()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => ruleForm.value.equipmentName, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    ruleForm.value.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+    helpList.value = data.filter(item => item.helpInstruction)
+  }
+})
+// 监听规格型号下拉框，修改辅助字段
+watch(() => ruleForm.value.model, (newVal) => {
+  if (newVal) {
+    ruleForm.value.helpInstruction = ''
+    // 修改规格型号和辅助字段列表
+    helpList.value = helpList.value.filter(item => item.model === newVal)
+  }
+})
+// 设备相关，填充数据
+watch(() => ruleForm.value, (newVal) => {
+  if (ruleForm.value.helpInstruction && ruleForm.value.model && ruleForm.value.equipmentName) {
+    console.log('自动')
+    const arr = allList.value.filter((item: any) => item.helpInstruction === ruleForm.value.helpInstruction && item.model === ruleForm.value.model && item.equipmentName === ruleForm.value.equipmentName)
+    if (arr.length) {
+      const data = arr[0]
+      ruleForm.value.category = data.category
+      ruleForm.value.remark = data.remark
+      ruleForm.value.technicalTargetList = data.technicalTargetList
+      ruleForm.value.checkCycle = data.checkCycle
+    }
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
 // 加载组织机构树形下拉
 const deptTreeList = ref()
 const fetchDeptTree = () => {
@@ -186,17 +242,17 @@
       getInfoDetail({ equipmentId: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
         console.log(res.data, 'res.data')
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
         if ($route.params.type === 'update') {
           ruleForm.value.approvalType = '2'
           ruleForm.value.approvalTypeName = '编辑设备'
@@ -211,17 +267,17 @@
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        if (ruleForm.value.testTask) {
-          if (ruleForm.value.testTask.includes(',')) {
-            testTask.value = ruleForm.value.testTask.split(',')
-          }
-          else {
-            testTask.value = [ruleForm.value.testTask]
-          }
-        }
-        else {
-          testTask.value = ['']
-        }
+        // if (ruleForm.value.testTask) {
+        //   if (ruleForm.value.testTask.includes(',')) {
+        //     testTask.value = ruleForm.value.testTask.split(',')
+        //   }
+        //   else {
+        //     testTask.value = [ruleForm.value.testTask]
+        //   }
+        // }
+        // else {
+        //   testTask.value = ['']
+        // }
       })
       // ruleForm.value = JSON.parse($route.query.row as string)
     }
@@ -410,6 +466,23 @@
   const filterData = data.filter(item => item !== fileName)
   ruleForm.value.instructionsFile = filterData.length ? filterData.join(',') : ''
 }
+// 删除参试任务
+const delHandler = (row: any) => {
+  // ruleForm.taskInfos
+  console.log(row, 'row')
+  ElMessageBox.confirm(
+    `确认删除${row.taskName}吗?`,
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    ruleForm.value.taskInfos = ruleForm.value.taskInfos.filter((item: any) => item.id !== row.id)
+    ElMessage.success('操作成功')
+  })
+}
 const print = () => {
 
 }
@@ -483,29 +556,34 @@
         >
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="统一编号">
-                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="设备名称" prop="equipmentName">
-                <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="使用状态" prop="usageStatus">
-                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
-                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.equipmentName" placeholder="设备名称" clearable style="width: 100%;">
+                  <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="重要等级" prop="level">
-                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
-                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+              <el-form-item label="型号规格" prop="model">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.model" placeholder="型号规格" clearable style="width: 100%;">
+                  <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="辅助字段" prop="helpInstruction">
+                <!-- <el-input v-model.trim="ruleForm.equipmentName" placeholder="设备名称" /> -->
+                <el-select v-model.trim="ruleForm.helpInstruction" placeholder="辅助字段" clearable style="width: 100%;">
+                  <el-option v-for="item in helpList" :key="item.id" :label="item.helpInstruction" :value="item.helpInstruction" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号" prop="manufactureNo">
+                <el-input v-model.trim="ruleForm.manufactureNo" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -519,11 +597,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="出厂编号" prop="manufactureNo">
-                <el-input v-model.trim="ruleForm.manufactureNo" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="生产日期" prop="productDate">
                 <el-date-picker
                   v-model="ruleForm.productDate" type="date" format="YYYY-MM-DD"
@@ -531,6 +604,14 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="购进日期" prop="purchaseDate">
+                <el-date-picker
+                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -543,30 +624,29 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="购进日期" prop="purchaseDate">
-                <el-date-picker
-                  v-model="ruleForm.purchaseDate" type="date" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" placeholder="请选择购进日期" class="normal-date" style="width: 100%;"
-                />
+              <el-form-item label="使用状态" prop="usageStatus">
+                <el-select v-model="ruleForm.usageStatus" placeholder="选择使用状态" style="width: 100%;" :disabled="!$route.path.includes('create')">
+                  <el-option v-for="item in useStatusList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="型号规格" prop="model">
                 <el-input v-model.trim="ruleForm.model" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="质量状况" prop="qualityCondition">
                 <el-input v-model.trim="ruleForm.qualityCondition" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="所在单位" prop="companyId">
                 <el-input v-model.trim="ruleForm.companyName" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="使用部门" prop="deptId">
                 <dept-select v-model="ruleForm.deptId" :data="deptTreeList" placeholder="选择使用部门" style="width: 100%;" />
@@ -574,20 +654,27 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备分类" prop="category">
-                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;">
+                <el-select v-model="ruleForm.category" placeholder="选择设备分类" style="width: 100%;" disabled>
                   <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检定周期" prop="checkCycle">
-                <el-input v-model.trim="ruleForm.checkCycle">
+                <el-input v-model.trim="ruleForm.checkCycle" disabled>
                   <template #append>
                     月
                   </template>
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="重要等级" prop="level">
+                <el-select v-model="ruleForm.level" placeholder="选择重要等级" style="width: 100%;">
+                  <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="12">
@@ -595,6 +682,11 @@
                 <el-input v-model.trim="ruleForm.remark" />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="统一编号">
+                <el-input v-model.trim="ruleForm.equipmentNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="24">
@@ -645,9 +737,6 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
-        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
-      </detail-block-com>
-      <detail-block-com>
         <el-form ref="ruleFormRef1" :model="ruleForm" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
@@ -679,11 +768,10 @@
             </el-col>
           </el-row>
           <el-row v-if="dialogStatus === 'detail' && ruleForm.groupInfos" :gutter="24" class="marg">
-            <el-col :span="2">
-              <el-form-item label="组别信息" prop="groupInfos" />
-            </el-col>
-            <el-col v-for="(item, index) in ruleForm.groupInfos" :key="index" :span="3.5">
-              <el-input v-model.trim="item.groupName" disabled />
+            <el-col :span="24">
+              <el-form-item label="组别信息" prop="groupInfos">
+                <el-input v-for="(item, index) in ruleForm.groupInfos" :key="index" v-model.trim="item.groupName" style="width: 280px;" disabled />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
@@ -696,7 +784,7 @@
               <el-input v-model.trim="ruleForm.installLocationExt" />
             </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <!-- <el-row :gutter="24" class="marg">
             <el-col :span="2">
               <el-form-item label="参试任务" prop="fileNo" />
             </el-col>
@@ -706,8 +794,30 @@
             <el-col v-if="dialogStatus !== 'detail'" :span="1">
               <icon-button icon="icon-add" title="" @click="addTask" />
             </el-col>
+          </el-row> -->
+          <el-row v-if="!$route.path.includes('create')" :gutter="24" class="marg">
+            <el-col :span="18">
+              <el-form-item label="参试任务" prop="fileNo">
+                <el-table :data="ruleForm.taskInfos">
+                  <el-table-column label="任务名称" prop="taskName" />
+                  <el-table-column label="开始时间" prop="startTime" />
+                  <el-table-column label="结束时间" prop="taskName" />
+                  <el-table-column label="备注" prop="remark" />
+                  <el-table-column v-if="$route.path.includes('update')" label="操作" width="70">
+                    <template #default=" scope ">
+                      <el-button
+                        link type="danger" size="small"
+                        @click="delHandler(scope.row)"
+                      >
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-row :gutter="24" class="marg">
+          <el-row :gutter="24" class="marg" style="margin-top: 15px;">
             <el-col :span="12">
               <el-form-item label="备注" prop="remarkExt">
                 <el-input v-model.trim="ruleForm.remarkExt" />
@@ -717,6 +827,9 @@
         </el-form>
       </detail-block-com>
       <detail-block-com>
+        <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
+      </detail-block-com>
+      <detail-block-com>
         <table-list ref="tableRef" :data="ruleForm.attachments" :status="$route.params.type as string" />
       </detail-block-com>
     </div>
@@ -739,6 +852,6 @@
 }
 
 .margin {
-  padding: 10px 10px;
+  padding: 10px;
 }
 </style>
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index fbb1f51..73bfbf4 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -12,6 +12,17 @@
   limit: number
   approvalStatus?: string
   formId?: string
+  model: string
+  manufactureNo: string
+  companyId: string
+  directorName: string
+  useSign: string
+  installLocation: string
+  taskId: string
+  checkOrganization: string
+  meterIdentify: string
+  checkDateStart: string
+  checkDateEnd: string
 }
 // 设备信息对象
 export interface IlistObjType {
diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue
index 2c0fc99..f962ae8 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -10,6 +10,8 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useTemplateDownload from '@/utils/useTemplateDownload'
 import { exportFile } from '@/utils/exportUtils'
+import { getDeviceNameList, getModelAllList, getModelList } from '@/api/eqpt/device/model'
+import { getTaskList } from '@/api/eqpt/device/task'
 import task from '@/views/tested/device/task/index.vue'
 const $props = defineProps({
   statusName: {
@@ -45,6 +47,17 @@
   limit: 20,
   approvalStatus: '',
   formId: SCHEDULE.DEVICE_INFO_APPROVAL,
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
+  companyId: '', // 所在单位
+  directorName: '', // 负责人
+  useSign: '', // 再用信息
+  installLocation: '', // 安装位置
+  taskId: '', // 参试任务
+  checkOrganization: '', // 检定机构
+  meterIdentify: '', // 计量标识
+  checkDateEnd: '',
+  checkDateStart: '',
 })
 const columns = ref([
   {
@@ -167,12 +180,57 @@
 }
 // 获取使用状态列表
 const useStatusList = ref()
+// 设备名称
+const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+// 设备分类
+const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
+// 再用信息
+const useSignList = ref<{ id: string; value: string; name: string }[]>([])
+// 任务列表
+const taskList = ref<{ id: string; value: string; name: string }[]>([])
+// 计量标识
+const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 规格型号
+const modelList = ref<any[]>([])
+const allList = ref<any[]>([])
 const fetchUseStatus = () => {
   getDictByCode('eqptDeviceUseStatus').then((res) => {
     useStatusList.value = res.data
   })
+  getDictByCode('eqptDeviceInUse').then((res) => {
+    useSignList.value = res.data
+  })
+  // 设备分类
+  getDictByCode('eqptDeviceType').then((res) => {
+    deviceTypeList.value = res.data
+  })
+  // 设备名称
+  getDeviceNameList().then((res) => {
+    deviceNameList.value = res.data
+  })
+  // 规格型号
+  getModelAllList({}).then((res) => {
+    allList.value = res.data
+    modelList.value = res.data
+  })
+  // 参试任务
+  getTaskList({ limit: 9999, offset: 1 }).then((res) => {
+    taskList.value = res.data.rows.map((item: any) => ({ name: item.taskName, value: item.id, id: item.id }))
+  })
+  getDictByCode('eqptMeterIdentify').then((res) => {
+    meterIdentifyList.value = res.data
+  })
 }
 fetchUseStatus()
+// 监听设备名称下拉框，修改规格型号和辅助字段
+watch(() => listQuery.equipmentName, (newVal) => {
+  if (newVal) {
+    listQuery.model = ''
+    // 修改规格型号和辅助字段列表
+    const data = allList.value.filter(item => item.equipmentName === newVal)
+    modelList.value = data
+  }
+})
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -189,16 +247,39 @@
     listQuery.certificateValidEnd = ''
   }
 })
+const datetimerange1 = ref()
+watch(() => datetimerange1.value, (newVal) => {
+  if (newVal.length) {
+    listQuery.checkDateStart = `${newVal[0]} 00:00:00`
+    listQuery.checkDateEnd = `${newVal[1]} 23:59:59`
+  }
+  else {
+    listQuery.checkDateStart = ''
+    listQuery.checkDateEnd = ''
+  }
+})
 // 重置
 const reset = () => {
   datetimerange.value = []
+  datetimerange1.value = []
   listQuery.equipmentNo = ''
   listQuery.equipmentName = ''
   listQuery.usageStatus = ''
   listQuery.usePosition = ''
   listQuery.certificateValidEnd = ''
   listQuery.certificateValidStart = ''
+  listQuery.model = ''
   listQuery.deptIds = ''
+  listQuery.manufactureNo = ''
+  listQuery.companyId = ''
+  listQuery.directorName = ''
+  listQuery.useSign = ''
+  listQuery.installLocation = ''
+  listQuery.checkOrganization = ''
+  listQuery.checkDateStart = ''
+  listQuery.checkDateEnd = ''
+  listQuery.taskId = ''
+  listQuery.meterIdentify = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -589,13 +670,17 @@
         <el-input v-model.trim="listQuery.equipmentNo" placeholder="统一编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
+        <el-select v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable>
+          <el-option v-for="(item, index) in deviceNameList" :key="index" :label="item" :value="item" />
+        </el-select>
       </search-item>
-      <!-- <search-item>
-        <el-input v-model.trim="listQuery.equipmentName" placeholder="设备名称" clearable />
-      </search-item> -->
       <search-item>
-        <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+        <el-select v-model.trim="listQuery.model" placeholder="规格型号" clearable>
+          <el-option v-for="item in modelList" :key="item.id" :label="item.model" :value="item.model" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" clearable />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.usageStatus" placeholder="使用状态" clearable>
@@ -603,11 +688,50 @@
         </el-select>
       </search-item>
       <search-item>
+        <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
+          <el-option v-for="item in useSignList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.installLocation" placeholder="安装位置" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.taskId" placeholder="参试任务" clearable>
+          <el-option v-for="item in taskList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
           format="YYYY-MM-DD" range-separator="至" start-placeholder="证书有效期开始时间" end-placeholder="证书有效期结束时间"
         />
       </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.checkOrganization" placeholder="检定(校准)机构" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange1" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="检定(校准)开始时间" end-placeholder="检定(校准)结束时间"
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
+          <el-option v-for="item in meterIdentifyList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
     </search-area>
     <table-container>
       <template v-if="$props.statusName === '全部'" #btns-right>
diff --git a/src/views/tested/device/info/components/technology.vue b/src/views/tested/device/info/components/technology.vue
index d31fb2d..9775daf 100644
--- a/src/views/tested/device/info/components/technology.vue
+++ b/src/views/tested/device/info/components/technology.vue
@@ -89,14 +89,14 @@
 
 <template>
   <detail-block-switch title="技术指标">
-    <template v-if="!$route.path.includes('detail')" #btns>
+    <!-- <template v-if="!$route.path.includes('detail')" #btns>
       <el-button type="primary" @click="addRow">
         增加行
       </el-button>
       <el-button type="info" @click="removeRow">
         删除行
       </el-button>
-    </template>
+    </template> -->
     <el-table
       ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
       @row-dblclick="dblclickRow"
diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue
index 3aa1183..45b613e 100644
--- a/src/views/tested/device/model/components/list.vue
+++ b/src/views/tested/device/model/components/list.vue
@@ -162,7 +162,7 @@
 }
 // 获取下拉列表相关
 // 设备名称
-const deviceNameList = ref<{ id: string; value: string; name: string }[]>([])
+const deviceNameList = ref<string[]>([])
 // 设备分类
 const deviceTypeList = ref<{ id: string; value: string; name: string }[]>([])
 // 规格型号
@@ -183,7 +183,7 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = res.data
-    helpList.value = res.data.filter(item => item.helpInstruction)
+    helpList.value = res.data.filter((item: any) => item.helpInstruction)
   })
 }
 fetchSelect()