diff --git a/.env.development b/.env.development
index 95707e0..ad705fc 100644
--- a/.env.development
+++ b/.env.development
@@ -3,10 +3,10 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.102:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.100:5909
 # VITE_METER_API_BASEURL = http://111.198.10.15:21606
-VITE_METER_API_BASEURL = http://192.168.8.102:5909
+VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710

diff --git a/.env.development b/.env.development
index 95707e0..ad705fc 100644
--- a/.env.development
+++ b/.env.development
@@ -3,10 +3,10 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.102:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.100:5909
 # VITE_METER_API_BASEURL = http://111.198.10.15:21606
-VITE_METER_API_BASEURL = http://192.168.8.102:5909
+VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index cfca39a..ffd6d38 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.102:5909",
-  "baseUrlBusiness": "http://192.168.8.102:5909",
+  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",

diff --git a/.env.development b/.env.development
index 95707e0..ad705fc 100644
--- a/.env.development
+++ b/.env.development
@@ -3,10 +3,10 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.102:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.100:5909
 # VITE_METER_API_BASEURL = http://111.198.10.15:21606
-VITE_METER_API_BASEURL = http://192.168.8.102:5909
+VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index cfca39a..ffd6d38 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.102:5909",
-  "baseUrlBusiness": "http://192.168.8.102:5909",
+  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d534327..d2c2999 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -3,11 +3,11 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getGroupList(params: object) {
+export function getGroupList(params: any) {
   return request({
-    url: '/equipment/group/listPage',
-    method: 'get',
-    params,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
   })
 }
 // 编辑

diff --git a/.env.development b/.env.development
index 95707e0..ad705fc 100644
--- a/.env.development
+++ b/.env.development
@@ -3,10 +3,10 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.102:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.100:5909
 # VITE_METER_API_BASEURL = http://111.198.10.15:21606
-VITE_METER_API_BASEURL = http://192.168.8.102:5909
+VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index cfca39a..ffd6d38 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.102:5909",
-  "baseUrlBusiness": "http://192.168.8.102:5909",
+  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d534327..d2c2999 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -3,11 +3,11 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getGroupList(params: object) {
+export function getGroupList(params: any) {
   return request({
-    url: '/equipment/group/listPage',
-    method: 'get',
-    params,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
   })
 }
 // 编辑
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index a46fd4c..ca0ce73 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -161,3 +161,12 @@
     data,
   })
 }
+// 获取检定去向
+export function defaultCheckDestination(data: object) {
+  return request({
+    url: '/equipment/model/defaultCheckDestination',
+    method: 'get',
+    params: data,
+  })
+}
+

diff --git a/.env.development b/.env.development
index 95707e0..ad705fc 100644
--- a/.env.development
+++ b/.env.development
@@ -3,10 +3,10 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.102:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.100:5909
 # VITE_METER_API_BASEURL = http://111.198.10.15:21606
-VITE_METER_API_BASEURL = http://192.168.8.102:5909
+VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index cfca39a..ffd6d38 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.102:5909",
-  "baseUrlBusiness": "http://192.168.8.102:5909",
+  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d534327..d2c2999 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -3,11 +3,11 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getGroupList(params: object) {
+export function getGroupList(params: any) {
   return request({
-    url: '/equipment/group/listPage',
-    method: 'get',
-    params,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
   })
 }
 // 编辑
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index a46fd4c..ca0ce73 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -161,3 +161,12 @@
     data,
   })
 }
+// 获取检定去向
+export function defaultCheckDestination(data: object) {
+  return request({
+    url: '/equipment/model/defaultCheckDestination',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d310206..6d4c8d8 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -11,8 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
-// import { getUserList } from '@/api/system/user'
+import { cancelInfo, defaultCheckDestination, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -28,8 +27,6 @@
 const userStore = useUserStore()
 const submitId = ref('未提交') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
-const ruleFormRef1 = ref<FormInstance>() // from组件
-const ruleFormRef2 = ref<FormInstance>() // from组件
 const statusName = $route.query.statusName as string
 const title = ref('')
 const isFrist = ref(true)
@@ -58,13 +55,13 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人名字
   deptId: '', // 使用部门id
-  directorName: '', // 负责人
+  directorId: '', // 负责人
   equipmentId: '', // 设备id
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   equipmentType: $route.query.equipmentType as string, // 设备类型(1受检设备;2特种设备)
   id: '', //
-  installLocation: '', // 安装位置(选择)
+  installLocationId: '', // 安装位置(选择)
   installLocationExt: '', // 安装位置(自定义编写)
   instructionsFile: '', // 说明书(minio存储文件名)（多个用,拼接）
   level: '', // 等级(字典code)
@@ -87,17 +84,19 @@
   unitPrice: '', // 单价(万元)
   updateTime: '', // 更新时间
   usageStatus: '', // 使用状态(字典code)
-  usePosition: '', // 使用岗位
+  usePositionId: '', // 使用岗位
   useSign: '', // 在用信息(字典code)
   helpInstruction: '', // 辅助字段
   companyName: '',
   certificateList: [],
-  submission: '0', // 送检状态
+  checkDestination: '', // 检定去向
+  // submission: '0', // 送检状态
 }) // 表单
 // 是否展示检定机构等一行信息
+const submission = ref('0')
 const submissionShow = ref(false)
 // 送检状态
-watch(() => ruleForm.value.submission, (newVal) => {
+watch(() => submission.value, (newVal) => {
   if (newVal === '0') {
     submissionShow.value = false
   }
@@ -130,7 +129,7 @@
 })
 const radio = ref('基本信息')
 // 表单1验证规则
-const rules1 = ref<FormRules>({
+const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
   equipmentNo: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
   usageStatus: [{ required: true, message: '使用状态必选', trigger: ['blur', 'change'] }],
@@ -142,23 +141,15 @@
   // 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'] }],
+  // 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'] }],
   // checkCycle: [{ required: true, message: '检定周期必填', trigger: ['blur', 'change'] }],
-})
-const rules2 = ref<FormRules>({
-  usePosition: [{ required: true, message: '使用岗位必填', trigger: ['blur', 'change'] }],
-  directorName: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  usePositionId: [{ required: true, message: '使用岗位必选', trigger: ['blur', 'change'] }],
+  directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
 })
-const rules3 = ref<FormRules>({
-  // checkOrganization: [{ required: true, message: '检定机构必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必填', trigger: ['blur', 'change'] }],
-  // checkDate: [{ required: true, message: '检定(校准)日期必选', trigger: ['blur', 'change'] }],
-  // certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-})
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
@@ -262,6 +253,7 @@
   }
 })
 // 设备相关，填充数据
+const companyId = ref('')
 watch(() => ruleForm.value, (newVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
@@ -277,6 +269,12 @@
       ruleForm.value.checkCycle = data.checkCycle
       ruleForm.value.modelId = data.id
       ruleForm.value.instructionsFile = data.instructionsFile
+      // 检定去向
+      defaultCheckDestination({ modelId: ruleForm.value.modelId, companyId: companyId.value }).then((res) => {
+        if (res.data) {
+          ruleForm.value.checkDestination = res.data
+        }
+      })
     }
   }
   // if ((helpList.value.length === 0 || (helpList.value.length === 1)) && ruleForm.value.model && ruleForm.value.equipmentName) {
@@ -295,15 +293,6 @@
   deep: true,
   immediate: true,
 })
-// 加载组织机构树形下拉
-const deptTreeList = ref()
-const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
@@ -312,14 +301,10 @@
   })
 }
 getuser()
-fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
-  ruleFormRef1.value?.resetFields()
-  ruleFormRef2.value?.resetFields()
-  console.log(userStore)
   if ($route.params.type === 'create') {
     isFrist.value = false
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
@@ -330,28 +315,23 @@
     testTask.value = ['']
     // 获取当前用户所在单位
     getUserDept().then((res) => {
-      console.log(res.data, '用户所在单位')
-      // fullName
       ruleForm.value.companyId = res.data.id
+      companyId.value = res.data.id
       ruleForm.value.companyName = res.data.fullName
     })
   }
   else {
-    // console.log(statusName, 'statusName')
+    const openSubmission = () => {
+      if (ruleForm.value.checkOrganization || ruleForm.value.checkDate || ruleForm.value.certificateValid || ruleForm.value.meterIdentify) {
+        submission.value = '1'
+      }
+      setTimeout(() => {
+        isFrist.value = false
+      }, 2000)
+    }
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $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 ($route.params.type === 'update') {
           ruleForm.value.approvalType = '2'
           ruleForm.value.approvalTypeName = '编辑设备'
@@ -361,30 +341,14 @@
           ruleForm.value.createUserName = userStore.name
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
-        setTimeout(() => {
-          isFrist.value = false
-        }, 2000)
+        openSubmission()
       })
     }
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        setTimeout(() => {
-          isFrist.value = false
-        }, 2000)
-        // if (ruleForm.value.testTask) {
-        //   if (ruleForm.value.testTask.includes(',')) {
-        //     testTask.value = ruleForm.value.testTask.split(',')
-        //   }
-        //   else {
-        //     testTask.value = [ruleForm.value.testTask]
-        //   }
-        // }
-        // else {
-        //   testTask.value = ['']
-        // }
+        openSubmission()
       })
-      // ruleForm.value = JSON.parse($route.query.row as string)
     }
   }
 }
@@ -407,10 +371,9 @@
 const certificateRef = ref()
 const disabledSave = ref(false)
 // 保存
-const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  console.log(formEl, formEl1)
-  if (!formEl || !formEl1 || !formEl2) { return }
-  Promise.all([formEl.validate(), formEl1.validate(), formEl2.validate()]).then(() => {
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  Promise.all([formEl.validate()]).then(() => {
     // 验证表格
     if (tableRef.value.checkCertificateList() && technologyRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
@@ -425,9 +388,6 @@
         disabledSave.value = true
         ruleForm.value.attachments = tableRef.value.list
         ruleForm.value.technicalTargetList = technologyRef.value.list
-        // if (!ruleForm.value.groupInfos.length) {
-        //   ruleForm.value.groupInfos = null
-        // }
         if ($route.path.includes('speciallist')) {
           //  特种设备
           ruleForm.value.certificateList = certificateRef.value.list
@@ -447,6 +407,8 @@
           else {
             ElMessage.success('保存成功')
           }
+        }).catch(() => {
+          disabledSave.value = false
         })
       })
     }
@@ -484,23 +446,12 @@
 }
 // 编辑
 const editForm = () => {
-  // $route.params.type = dialogStatus.value
-  // mainPage.reload()
-  // $router.push({
-  //   path: `/dinfo/${dialogStatus.value}`,
-  //   query: {
-  //     row: $route.query.row,
-  //     statusName,
-  //   },
-  // })
-  // document.getElementById('reload-btn')?.click()
   $router.push({
     // params: { ...$route.params, type: 'update' },
     path: `/${$route.query.equipmentType === '1' ? 'dinfo' : 'speciallist'}/update`,
     query: { ...$route.query },
   })
   initDialog()
-  // document.getElementById('reload-btn')?.click()
 }
 // 删除
 const delForm = () => {
@@ -641,7 +592,7 @@
         <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" :disabled="disabledSave" @click="saveForm(ruleFormRef, ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" :disabled="disabledSave" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
@@ -663,8 +614,11 @@
     </detail-block-com>
     <!-- 基本信息 -->
     <div v-show="radio === '基本信息'">
-      <detail-block-com v-show="!$route.path.includes('detail')">
-        <el-form label-position="right" label-width="110px" class="form" :disable="$route.path.includes('detail')">
+      <el-form
+        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      >
+        <detail-block-com v-show="!$route.path.includes('detail')">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="审批类型">
@@ -682,13 +636,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
-      <detail-block-com>
-        <el-form
-          ref="ruleFormRef" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form"
-          :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
-        >
+        </detail-block-com>
+        <detail-block-com>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="设备名称" prop="equipmentName">
@@ -787,7 +736,7 @@
           <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%;" />
+                <dept-select v-model="ruleForm.deptId" :need-top="false" placeholder="选择使用部门" style="width: 100%;" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -815,9 +764,18 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="备注" prop="remark">
-                <el-input v-model.trim="ruleForm.remark" />
+                <el-input v-model.trim="ruleForm.remark" type="textarea" :rows="1" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定去向" prop="checkDestination">
+                <el-select v-model="ruleForm.checkDestination" placeholder="检定去向" style="width: 100%;">
+                  <!-- <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" /> -->
+                  <el-option label="计量室" value="1" />
+                  <el-option label="外送" value="2" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -828,7 +786,7 @@
             <el-col :span="6">
               <el-form-item label="设备送检状态">
                 <el-switch
-                  v-model="ruleForm.submission"
+                  v-model="submission"
                   size="large"
                   active-value="1"
                   inactive-value="0"
@@ -848,10 +806,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
-      <detail-block-com v-if="submissionShow">
-        <el-form ref="ruleFormRef2" :rules="rules3" label-position="right" label-width="130px" :model="ruleForm" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
+        </detail-block-com>
+        <detail-block-com v-if="submissionShow">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -883,24 +839,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </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')">
+        </detail-block-com>
+        <detail-block-com>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="使用岗位" prop="usePosition">
+              <el-form-item label="使用岗位" prop="usePositionId">
                 <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
-                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                <el-select v-model="ruleForm.usePositionId" placeholder="使用岗位" clearable style="width: 100%;">
                   <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="负责人" prop="directorName">
+              <el-form-item label="负责人" prop="directorId">
                 <!-- <el-input v-model.trim="ruleForm.directorName" /> -->
-                <el-select v-model="ruleForm.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
-                  <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
+                <el-select v-model="ruleForm.directorId" filterable clearable placeholder="负责人" style="width: 100%;">
+                  <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
                     <span style="float: left;">{{ item.name }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                   </el-option>
@@ -937,9 +891,9 @@
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="安装位置" prop="installLocation">
+              <el-form-item label="安装位置" prop="installLocationId">
                 <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
-                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                <el-select v-model="ruleForm.installLocationId" placeholder="安装位置" clearable style="width: 100%;">
                   <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -990,8 +944,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
+        </detail-block-com>
+      </el-form>
       <detail-block-com>
         <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
       </detail-block-com>

diff --git a/.env.development b/.env.development
index 95707e0..ad705fc 100644
--- a/.env.development
+++ b/.env.development
@@ -3,10 +3,10 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.102:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.100:5909
 # VITE_METER_API_BASEURL = http://111.198.10.15:21606
-VITE_METER_API_BASEURL = http://192.168.8.102:5909
+VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index cfca39a..ffd6d38 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.102:5909",
-  "baseUrlBusiness": "http://192.168.8.102:5909",
+  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d534327..d2c2999 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -3,11 +3,11 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getGroupList(params: object) {
+export function getGroupList(params: any) {
   return request({
-    url: '/equipment/group/listPage',
-    method: 'get',
-    params,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
   })
 }
 // 编辑
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index a46fd4c..ca0ce73 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -161,3 +161,12 @@
     data,
   })
 }
+// 获取检定去向
+export function defaultCheckDestination(data: object) {
+  return request({
+    url: '/equipment/model/defaultCheckDestination',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d310206..6d4c8d8 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -11,8 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
-// import { getUserList } from '@/api/system/user'
+import { cancelInfo, defaultCheckDestination, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -28,8 +27,6 @@
 const userStore = useUserStore()
 const submitId = ref('未提交') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
-const ruleFormRef1 = ref<FormInstance>() // from组件
-const ruleFormRef2 = ref<FormInstance>() // from组件
 const statusName = $route.query.statusName as string
 const title = ref('')
 const isFrist = ref(true)
@@ -58,13 +55,13 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人名字
   deptId: '', // 使用部门id
-  directorName: '', // 负责人
+  directorId: '', // 负责人
   equipmentId: '', // 设备id
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   equipmentType: $route.query.equipmentType as string, // 设备类型(1受检设备;2特种设备)
   id: '', //
-  installLocation: '', // 安装位置(选择)
+  installLocationId: '', // 安装位置(选择)
   installLocationExt: '', // 安装位置(自定义编写)
   instructionsFile: '', // 说明书(minio存储文件名)（多个用,拼接）
   level: '', // 等级(字典code)
@@ -87,17 +84,19 @@
   unitPrice: '', // 单价(万元)
   updateTime: '', // 更新时间
   usageStatus: '', // 使用状态(字典code)
-  usePosition: '', // 使用岗位
+  usePositionId: '', // 使用岗位
   useSign: '', // 在用信息(字典code)
   helpInstruction: '', // 辅助字段
   companyName: '',
   certificateList: [],
-  submission: '0', // 送检状态
+  checkDestination: '', // 检定去向
+  // submission: '0', // 送检状态
 }) // 表单
 // 是否展示检定机构等一行信息
+const submission = ref('0')
 const submissionShow = ref(false)
 // 送检状态
-watch(() => ruleForm.value.submission, (newVal) => {
+watch(() => submission.value, (newVal) => {
   if (newVal === '0') {
     submissionShow.value = false
   }
@@ -130,7 +129,7 @@
 })
 const radio = ref('基本信息')
 // 表单1验证规则
-const rules1 = ref<FormRules>({
+const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
   equipmentNo: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
   usageStatus: [{ required: true, message: '使用状态必选', trigger: ['blur', 'change'] }],
@@ -142,23 +141,15 @@
   // 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'] }],
+  // 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'] }],
   // checkCycle: [{ required: true, message: '检定周期必填', trigger: ['blur', 'change'] }],
-})
-const rules2 = ref<FormRules>({
-  usePosition: [{ required: true, message: '使用岗位必填', trigger: ['blur', 'change'] }],
-  directorName: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  usePositionId: [{ required: true, message: '使用岗位必选', trigger: ['blur', 'change'] }],
+  directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
 })
-const rules3 = ref<FormRules>({
-  // checkOrganization: [{ required: true, message: '检定机构必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必填', trigger: ['blur', 'change'] }],
-  // checkDate: [{ required: true, message: '检定(校准)日期必选', trigger: ['blur', 'change'] }],
-  // certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-})
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
@@ -262,6 +253,7 @@
   }
 })
 // 设备相关，填充数据
+const companyId = ref('')
 watch(() => ruleForm.value, (newVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
@@ -277,6 +269,12 @@
       ruleForm.value.checkCycle = data.checkCycle
       ruleForm.value.modelId = data.id
       ruleForm.value.instructionsFile = data.instructionsFile
+      // 检定去向
+      defaultCheckDestination({ modelId: ruleForm.value.modelId, companyId: companyId.value }).then((res) => {
+        if (res.data) {
+          ruleForm.value.checkDestination = res.data
+        }
+      })
     }
   }
   // if ((helpList.value.length === 0 || (helpList.value.length === 1)) && ruleForm.value.model && ruleForm.value.equipmentName) {
@@ -295,15 +293,6 @@
   deep: true,
   immediate: true,
 })
-// 加载组织机构树形下拉
-const deptTreeList = ref()
-const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
@@ -312,14 +301,10 @@
   })
 }
 getuser()
-fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
-  ruleFormRef1.value?.resetFields()
-  ruleFormRef2.value?.resetFields()
-  console.log(userStore)
   if ($route.params.type === 'create') {
     isFrist.value = false
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
@@ -330,28 +315,23 @@
     testTask.value = ['']
     // 获取当前用户所在单位
     getUserDept().then((res) => {
-      console.log(res.data, '用户所在单位')
-      // fullName
       ruleForm.value.companyId = res.data.id
+      companyId.value = res.data.id
       ruleForm.value.companyName = res.data.fullName
     })
   }
   else {
-    // console.log(statusName, 'statusName')
+    const openSubmission = () => {
+      if (ruleForm.value.checkOrganization || ruleForm.value.checkDate || ruleForm.value.certificateValid || ruleForm.value.meterIdentify) {
+        submission.value = '1'
+      }
+      setTimeout(() => {
+        isFrist.value = false
+      }, 2000)
+    }
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $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 ($route.params.type === 'update') {
           ruleForm.value.approvalType = '2'
           ruleForm.value.approvalTypeName = '编辑设备'
@@ -361,30 +341,14 @@
           ruleForm.value.createUserName = userStore.name
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
-        setTimeout(() => {
-          isFrist.value = false
-        }, 2000)
+        openSubmission()
       })
     }
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        setTimeout(() => {
-          isFrist.value = false
-        }, 2000)
-        // if (ruleForm.value.testTask) {
-        //   if (ruleForm.value.testTask.includes(',')) {
-        //     testTask.value = ruleForm.value.testTask.split(',')
-        //   }
-        //   else {
-        //     testTask.value = [ruleForm.value.testTask]
-        //   }
-        // }
-        // else {
-        //   testTask.value = ['']
-        // }
+        openSubmission()
       })
-      // ruleForm.value = JSON.parse($route.query.row as string)
     }
   }
 }
@@ -407,10 +371,9 @@
 const certificateRef = ref()
 const disabledSave = ref(false)
 // 保存
-const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  console.log(formEl, formEl1)
-  if (!formEl || !formEl1 || !formEl2) { return }
-  Promise.all([formEl.validate(), formEl1.validate(), formEl2.validate()]).then(() => {
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  Promise.all([formEl.validate()]).then(() => {
     // 验证表格
     if (tableRef.value.checkCertificateList() && technologyRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
@@ -425,9 +388,6 @@
         disabledSave.value = true
         ruleForm.value.attachments = tableRef.value.list
         ruleForm.value.technicalTargetList = technologyRef.value.list
-        // if (!ruleForm.value.groupInfos.length) {
-        //   ruleForm.value.groupInfos = null
-        // }
         if ($route.path.includes('speciallist')) {
           //  特种设备
           ruleForm.value.certificateList = certificateRef.value.list
@@ -447,6 +407,8 @@
           else {
             ElMessage.success('保存成功')
           }
+        }).catch(() => {
+          disabledSave.value = false
         })
       })
     }
@@ -484,23 +446,12 @@
 }
 // 编辑
 const editForm = () => {
-  // $route.params.type = dialogStatus.value
-  // mainPage.reload()
-  // $router.push({
-  //   path: `/dinfo/${dialogStatus.value}`,
-  //   query: {
-  //     row: $route.query.row,
-  //     statusName,
-  //   },
-  // })
-  // document.getElementById('reload-btn')?.click()
   $router.push({
     // params: { ...$route.params, type: 'update' },
     path: `/${$route.query.equipmentType === '1' ? 'dinfo' : 'speciallist'}/update`,
     query: { ...$route.query },
   })
   initDialog()
-  // document.getElementById('reload-btn')?.click()
 }
 // 删除
 const delForm = () => {
@@ -641,7 +592,7 @@
         <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" :disabled="disabledSave" @click="saveForm(ruleFormRef, ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" :disabled="disabledSave" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
@@ -663,8 +614,11 @@
     </detail-block-com>
     <!-- 基本信息 -->
     <div v-show="radio === '基本信息'">
-      <detail-block-com v-show="!$route.path.includes('detail')">
-        <el-form label-position="right" label-width="110px" class="form" :disable="$route.path.includes('detail')">
+      <el-form
+        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      >
+        <detail-block-com v-show="!$route.path.includes('detail')">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="审批类型">
@@ -682,13 +636,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
-      <detail-block-com>
-        <el-form
-          ref="ruleFormRef" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form"
-          :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
-        >
+        </detail-block-com>
+        <detail-block-com>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="设备名称" prop="equipmentName">
@@ -787,7 +736,7 @@
           <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%;" />
+                <dept-select v-model="ruleForm.deptId" :need-top="false" placeholder="选择使用部门" style="width: 100%;" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -815,9 +764,18 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="备注" prop="remark">
-                <el-input v-model.trim="ruleForm.remark" />
+                <el-input v-model.trim="ruleForm.remark" type="textarea" :rows="1" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定去向" prop="checkDestination">
+                <el-select v-model="ruleForm.checkDestination" placeholder="检定去向" style="width: 100%;">
+                  <!-- <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" /> -->
+                  <el-option label="计量室" value="1" />
+                  <el-option label="外送" value="2" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -828,7 +786,7 @@
             <el-col :span="6">
               <el-form-item label="设备送检状态">
                 <el-switch
-                  v-model="ruleForm.submission"
+                  v-model="submission"
                   size="large"
                   active-value="1"
                   inactive-value="0"
@@ -848,10 +806,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
-      <detail-block-com v-if="submissionShow">
-        <el-form ref="ruleFormRef2" :rules="rules3" label-position="right" label-width="130px" :model="ruleForm" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
+        </detail-block-com>
+        <detail-block-com v-if="submissionShow">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -883,24 +839,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </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')">
+        </detail-block-com>
+        <detail-block-com>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="使用岗位" prop="usePosition">
+              <el-form-item label="使用岗位" prop="usePositionId">
                 <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
-                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                <el-select v-model="ruleForm.usePositionId" placeholder="使用岗位" clearable style="width: 100%;">
                   <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="负责人" prop="directorName">
+              <el-form-item label="负责人" prop="directorId">
                 <!-- <el-input v-model.trim="ruleForm.directorName" /> -->
-                <el-select v-model="ruleForm.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
-                  <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
+                <el-select v-model="ruleForm.directorId" filterable clearable placeholder="负责人" style="width: 100%;">
+                  <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
                     <span style="float: left;">{{ item.name }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                   </el-option>
@@ -937,9 +891,9 @@
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="安装位置" prop="installLocation">
+              <el-form-item label="安装位置" prop="installLocationId">
                 <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
-                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                <el-select v-model="ruleForm.installLocationId" placeholder="安装位置" clearable style="width: 100%;">
                   <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -990,8 +944,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
+        </detail-block-com>
+      </el-form>
       <detail-block-com>
         <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
       </detail-block-com>
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index 0807e07..e024d75 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -4,7 +4,7 @@
   certificateValidEnd: string
   deptIds: string
   usageStatus: string
-  usePosition: string // 使用岗位
+  usePositionId: string // 使用岗位
   equipmentNo: string
   equipmentName: string
   equipmentType: string
@@ -26,7 +26,8 @@
   sort: string
   orderBy: string
   manufacturer?: string
-  groupName?: string
+  groupId?: string
+  directorId?: string
 }
 // 设备信息对象
 export interface IlistObjType {

diff --git a/.env.development b/.env.development
index 95707e0..ad705fc 100644
--- a/.env.development
+++ b/.env.development
@@ -3,10 +3,10 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.102:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.100:5909
 # VITE_METER_API_BASEURL = http://111.198.10.15:21606
-VITE_METER_API_BASEURL = http://192.168.8.102:5909
+VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index cfca39a..ffd6d38 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.102:5909",
-  "baseUrlBusiness": "http://192.168.8.102:5909",
+  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d534327..d2c2999 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -3,11 +3,11 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getGroupList(params: object) {
+export function getGroupList(params: any) {
   return request({
-    url: '/equipment/group/listPage',
-    method: 'get',
-    params,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
   })
 }
 // 编辑
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index a46fd4c..ca0ce73 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -161,3 +161,12 @@
     data,
   })
 }
+// 获取检定去向
+export function defaultCheckDestination(data: object) {
+  return request({
+    url: '/equipment/model/defaultCheckDestination',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d310206..6d4c8d8 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -11,8 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
-// import { getUserList } from '@/api/system/user'
+import { cancelInfo, defaultCheckDestination, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -28,8 +27,6 @@
 const userStore = useUserStore()
 const submitId = ref('未提交') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
-const ruleFormRef1 = ref<FormInstance>() // from组件
-const ruleFormRef2 = ref<FormInstance>() // from组件
 const statusName = $route.query.statusName as string
 const title = ref('')
 const isFrist = ref(true)
@@ -58,13 +55,13 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人名字
   deptId: '', // 使用部门id
-  directorName: '', // 负责人
+  directorId: '', // 负责人
   equipmentId: '', // 设备id
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   equipmentType: $route.query.equipmentType as string, // 设备类型(1受检设备;2特种设备)
   id: '', //
-  installLocation: '', // 安装位置(选择)
+  installLocationId: '', // 安装位置(选择)
   installLocationExt: '', // 安装位置(自定义编写)
   instructionsFile: '', // 说明书(minio存储文件名)（多个用,拼接）
   level: '', // 等级(字典code)
@@ -87,17 +84,19 @@
   unitPrice: '', // 单价(万元)
   updateTime: '', // 更新时间
   usageStatus: '', // 使用状态(字典code)
-  usePosition: '', // 使用岗位
+  usePositionId: '', // 使用岗位
   useSign: '', // 在用信息(字典code)
   helpInstruction: '', // 辅助字段
   companyName: '',
   certificateList: [],
-  submission: '0', // 送检状态
+  checkDestination: '', // 检定去向
+  // submission: '0', // 送检状态
 }) // 表单
 // 是否展示检定机构等一行信息
+const submission = ref('0')
 const submissionShow = ref(false)
 // 送检状态
-watch(() => ruleForm.value.submission, (newVal) => {
+watch(() => submission.value, (newVal) => {
   if (newVal === '0') {
     submissionShow.value = false
   }
@@ -130,7 +129,7 @@
 })
 const radio = ref('基本信息')
 // 表单1验证规则
-const rules1 = ref<FormRules>({
+const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
   equipmentNo: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
   usageStatus: [{ required: true, message: '使用状态必选', trigger: ['blur', 'change'] }],
@@ -142,23 +141,15 @@
   // 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'] }],
+  // 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'] }],
   // checkCycle: [{ required: true, message: '检定周期必填', trigger: ['blur', 'change'] }],
-})
-const rules2 = ref<FormRules>({
-  usePosition: [{ required: true, message: '使用岗位必填', trigger: ['blur', 'change'] }],
-  directorName: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  usePositionId: [{ required: true, message: '使用岗位必选', trigger: ['blur', 'change'] }],
+  directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
 })
-const rules3 = ref<FormRules>({
-  // checkOrganization: [{ required: true, message: '检定机构必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必填', trigger: ['blur', 'change'] }],
-  // checkDate: [{ required: true, message: '检定(校准)日期必选', trigger: ['blur', 'change'] }],
-  // certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-})
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
@@ -262,6 +253,7 @@
   }
 })
 // 设备相关，填充数据
+const companyId = ref('')
 watch(() => ruleForm.value, (newVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
@@ -277,6 +269,12 @@
       ruleForm.value.checkCycle = data.checkCycle
       ruleForm.value.modelId = data.id
       ruleForm.value.instructionsFile = data.instructionsFile
+      // 检定去向
+      defaultCheckDestination({ modelId: ruleForm.value.modelId, companyId: companyId.value }).then((res) => {
+        if (res.data) {
+          ruleForm.value.checkDestination = res.data
+        }
+      })
     }
   }
   // if ((helpList.value.length === 0 || (helpList.value.length === 1)) && ruleForm.value.model && ruleForm.value.equipmentName) {
@@ -295,15 +293,6 @@
   deep: true,
   immediate: true,
 })
-// 加载组织机构树形下拉
-const deptTreeList = ref()
-const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
@@ -312,14 +301,10 @@
   })
 }
 getuser()
-fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
-  ruleFormRef1.value?.resetFields()
-  ruleFormRef2.value?.resetFields()
-  console.log(userStore)
   if ($route.params.type === 'create') {
     isFrist.value = false
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
@@ -330,28 +315,23 @@
     testTask.value = ['']
     // 获取当前用户所在单位
     getUserDept().then((res) => {
-      console.log(res.data, '用户所在单位')
-      // fullName
       ruleForm.value.companyId = res.data.id
+      companyId.value = res.data.id
       ruleForm.value.companyName = res.data.fullName
     })
   }
   else {
-    // console.log(statusName, 'statusName')
+    const openSubmission = () => {
+      if (ruleForm.value.checkOrganization || ruleForm.value.checkDate || ruleForm.value.certificateValid || ruleForm.value.meterIdentify) {
+        submission.value = '1'
+      }
+      setTimeout(() => {
+        isFrist.value = false
+      }, 2000)
+    }
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $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 ($route.params.type === 'update') {
           ruleForm.value.approvalType = '2'
           ruleForm.value.approvalTypeName = '编辑设备'
@@ -361,30 +341,14 @@
           ruleForm.value.createUserName = userStore.name
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
-        setTimeout(() => {
-          isFrist.value = false
-        }, 2000)
+        openSubmission()
       })
     }
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        setTimeout(() => {
-          isFrist.value = false
-        }, 2000)
-        // if (ruleForm.value.testTask) {
-        //   if (ruleForm.value.testTask.includes(',')) {
-        //     testTask.value = ruleForm.value.testTask.split(',')
-        //   }
-        //   else {
-        //     testTask.value = [ruleForm.value.testTask]
-        //   }
-        // }
-        // else {
-        //   testTask.value = ['']
-        // }
+        openSubmission()
       })
-      // ruleForm.value = JSON.parse($route.query.row as string)
     }
   }
 }
@@ -407,10 +371,9 @@
 const certificateRef = ref()
 const disabledSave = ref(false)
 // 保存
-const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  console.log(formEl, formEl1)
-  if (!formEl || !formEl1 || !formEl2) { return }
-  Promise.all([formEl.validate(), formEl1.validate(), formEl2.validate()]).then(() => {
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  Promise.all([formEl.validate()]).then(() => {
     // 验证表格
     if (tableRef.value.checkCertificateList() && technologyRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
@@ -425,9 +388,6 @@
         disabledSave.value = true
         ruleForm.value.attachments = tableRef.value.list
         ruleForm.value.technicalTargetList = technologyRef.value.list
-        // if (!ruleForm.value.groupInfos.length) {
-        //   ruleForm.value.groupInfos = null
-        // }
         if ($route.path.includes('speciallist')) {
           //  特种设备
           ruleForm.value.certificateList = certificateRef.value.list
@@ -447,6 +407,8 @@
           else {
             ElMessage.success('保存成功')
           }
+        }).catch(() => {
+          disabledSave.value = false
         })
       })
     }
@@ -484,23 +446,12 @@
 }
 // 编辑
 const editForm = () => {
-  // $route.params.type = dialogStatus.value
-  // mainPage.reload()
-  // $router.push({
-  //   path: `/dinfo/${dialogStatus.value}`,
-  //   query: {
-  //     row: $route.query.row,
-  //     statusName,
-  //   },
-  // })
-  // document.getElementById('reload-btn')?.click()
   $router.push({
     // params: { ...$route.params, type: 'update' },
     path: `/${$route.query.equipmentType === '1' ? 'dinfo' : 'speciallist'}/update`,
     query: { ...$route.query },
   })
   initDialog()
-  // document.getElementById('reload-btn')?.click()
 }
 // 删除
 const delForm = () => {
@@ -641,7 +592,7 @@
         <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" :disabled="disabledSave" @click="saveForm(ruleFormRef, ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" :disabled="disabledSave" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
@@ -663,8 +614,11 @@
     </detail-block-com>
     <!-- 基本信息 -->
     <div v-show="radio === '基本信息'">
-      <detail-block-com v-show="!$route.path.includes('detail')">
-        <el-form label-position="right" label-width="110px" class="form" :disable="$route.path.includes('detail')">
+      <el-form
+        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      >
+        <detail-block-com v-show="!$route.path.includes('detail')">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="审批类型">
@@ -682,13 +636,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
-      <detail-block-com>
-        <el-form
-          ref="ruleFormRef" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form"
-          :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
-        >
+        </detail-block-com>
+        <detail-block-com>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="设备名称" prop="equipmentName">
@@ -787,7 +736,7 @@
           <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%;" />
+                <dept-select v-model="ruleForm.deptId" :need-top="false" placeholder="选择使用部门" style="width: 100%;" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -815,9 +764,18 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="备注" prop="remark">
-                <el-input v-model.trim="ruleForm.remark" />
+                <el-input v-model.trim="ruleForm.remark" type="textarea" :rows="1" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定去向" prop="checkDestination">
+                <el-select v-model="ruleForm.checkDestination" placeholder="检定去向" style="width: 100%;">
+                  <!-- <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" /> -->
+                  <el-option label="计量室" value="1" />
+                  <el-option label="外送" value="2" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -828,7 +786,7 @@
             <el-col :span="6">
               <el-form-item label="设备送检状态">
                 <el-switch
-                  v-model="ruleForm.submission"
+                  v-model="submission"
                   size="large"
                   active-value="1"
                   inactive-value="0"
@@ -848,10 +806,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
-      <detail-block-com v-if="submissionShow">
-        <el-form ref="ruleFormRef2" :rules="rules3" label-position="right" label-width="130px" :model="ruleForm" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
+        </detail-block-com>
+        <detail-block-com v-if="submissionShow">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -883,24 +839,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </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')">
+        </detail-block-com>
+        <detail-block-com>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="使用岗位" prop="usePosition">
+              <el-form-item label="使用岗位" prop="usePositionId">
                 <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
-                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                <el-select v-model="ruleForm.usePositionId" placeholder="使用岗位" clearable style="width: 100%;">
                   <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="负责人" prop="directorName">
+              <el-form-item label="负责人" prop="directorId">
                 <!-- <el-input v-model.trim="ruleForm.directorName" /> -->
-                <el-select v-model="ruleForm.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
-                  <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
+                <el-select v-model="ruleForm.directorId" filterable clearable placeholder="负责人" style="width: 100%;">
+                  <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
                     <span style="float: left;">{{ item.name }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                   </el-option>
@@ -937,9 +891,9 @@
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="安装位置" prop="installLocation">
+              <el-form-item label="安装位置" prop="installLocationId">
                 <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
-                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                <el-select v-model="ruleForm.installLocationId" placeholder="安装位置" clearable style="width: 100%;">
                   <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -990,8 +944,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
+        </detail-block-com>
+      </el-form>
       <detail-block-com>
         <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
       </detail-block-com>
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index 0807e07..e024d75 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -4,7 +4,7 @@
   certificateValidEnd: string
   deptIds: string
   usageStatus: string
-  usePosition: string // 使用岗位
+  usePositionId: string // 使用岗位
   equipmentNo: string
   equipmentName: string
   equipmentType: string
@@ -26,7 +26,8 @@
   sort: string
   orderBy: string
   manufacturer?: string
-  groupName?: string
+  groupId?: string
+  directorId?: 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 e21ec50..091c2f6 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -2,8 +2,8 @@
 <script lang="ts" setup name="DeviceInfoList">
 import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-
 import type { IlistObjType, IlistQueryType } from './interface'
+import useUserStore from '@/store/modules/user'
 import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
@@ -19,6 +19,7 @@
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -30,6 +31,7 @@
     default: '1',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -55,7 +57,7 @@
   certificateValidEnd: '',
   deptIds: '', // 使用部门
   usageStatus: '', // 使用状态
-  usePosition: '', // 使用岗位
+  usePositionId: '', // 使用岗位
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   equipmentType: $props.equipmentType, // 设备类型(1受检设备;2特种设备)
@@ -77,7 +79,17 @@
   sort: '',
   orderBy: '',
   manufacturer: '', // 生产厂家
-  groupName: '', // 分组
+  groupId: '', // 分组
+  directorId: $props.statusName === '全部' ? userStore.id : '',
+})
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.directorId = $props.statusName === '全部' ? userStore.id : ''
+  }
+  else {
+    listQuery.directorId = ''
+  }
 })
 const columns = ref([
   // {
@@ -110,21 +122,21 @@
     text: '生产厂家',
     value: 'manufacturer',
     align: 'center',
-    sortable: 'custom',
+    // sortable: 'custom',
     filters: true,
   },
   {
     text: '所在单位',
     value: 'companyName',
     align: 'center',
-    sortable: 'custom',
+    // sortable: 'custom',
     filters: true,
   },
   {
     text: '使用部门',
     value: 'deptName',
     align: 'center',
-    sortable: 'custom',
+    // sortable: 'custom',
     filters: true,
   },
   {
@@ -162,7 +174,6 @@
     text: '分组',
     value: 'groupName',
     align: 'center',
-    sortable: 'custom',
     filters: true,
   },
 ])
@@ -258,7 +269,12 @@
     // console.log('倒叙')
   }
   console.log(underlineToHump(column.prop), column.prop)
-  listQuery.orderBy = underlineToHump(column.prop)
+  let data = underlineToHump(column.prop)
+  if (data.split('_')[data.split('_').length - 1] === 'name') {
+    data = data.split('_').slice(0, data.split('_').length - 1).join('_')
+    console.log(data, 'data')
+  }
+  listQuery.orderBy = data
   fetchData()
 }
 // 获取使用状态列表
@@ -273,6 +289,8 @@
 const taskList = ref<{ id: string; value: string; name: string }[]>([])
 // 计量标识
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 // 安装位置
 const installLocationList = ref<any[]>([])
 // 使用岗位
@@ -322,6 +340,11 @@
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
   })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
 }
 fetchUseStatus()
 // 监听设备名称下拉框，修改规格型号和辅助字段
@@ -367,7 +390,7 @@
   listQuery.equipmentNo = ''
   listQuery.equipmentName = ''
   listQuery.usageStatus = ''
-  listQuery.usePosition = ''
+  listQuery.usePositionId = ''
   listQuery.certificateValidEnd = ''
   listQuery.certificateValidStart = ''
   listQuery.model = ''
@@ -385,7 +408,9 @@
   listQuery.sort = ''
   listQuery.orderBy = ''
   listQuery.manufacturer = ''
-  listQuery.groupName = ''
+  listQuery.groupId = ''
+  listQuery.directorId = $props.statusName === '全部' ? userStore.id : ''
+  checked.value = true
   modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
   listQuery.offset = 1
   listQuery.limit = 20
@@ -527,6 +552,12 @@
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
+  // 当角色是操作手时，只有负责人是自己时可以编辑/删除
+  if ($props.statusName === '全部' && userStore.roleNames.includes('操作手') && type === 'update') {
+    if (row.directorName !== userStore.name) {
+      return
+    }
+  }
   $router.push({
     path: `/${$props.equipmentType === '1' ? 'dinfo' : 'speciallist'}/${type}`,
     query: {
@@ -660,6 +691,12 @@
 // 删除
 const delHandler = (row: IlistObjType) => {
   if ($props.statusName === '全部') {
+    // 当角色是操作手时，只有负责人是自己时可以编辑/删除
+    if (userStore.roleNames.includes('操作手')) {
+      if (row.directorName !== userStore.name) {
+        return
+      }
+    }
     // 删除设备
     ElMessageBox.prompt('请填写删除原因', '确认删除', {
       confirmButtonText: '确认',
@@ -825,10 +862,10 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
+        <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
+        <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
@@ -848,7 +885,7 @@
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
           <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
-            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
             </el-option>
@@ -873,7 +910,7 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePosition" placeholder="使用岗位" clearable>
+          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位" clearable>
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
@@ -889,10 +926,13 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.groupName" placeholder="分组" clearable />
+          <el-select v-model="listQuery.groupId" placeholder="分组" clearable>
+            <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+          <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
         </search-item>
-        <search-item>
-          <el-checkbox v-model="listQuery.checked1" size="large" checked>只看我负责的</el-checkbox>
+        <search-item v-show="$props.statusName === '全部'">
+          <el-checkbox v-model="checked" size="large" checked>只看我负责的</el-checkbox>
         </search-item>
         <!-- <search-item>
           <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>

diff --git a/.env.development b/.env.development
index 95707e0..ad705fc 100644
--- a/.env.development
+++ b/.env.development
@@ -3,10 +3,10 @@
 VITE_SYS_TITLE = 受检设备管理系统
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://139.198.29.133:8089
-VITE_APP_API_BASEURL = http://192.168.8.102:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.100:5909
 # VITE_METER_API_BASEURL = http://111.198.10.15:21606
-VITE_METER_API_BASEURL = http://192.168.8.102:5909
+VITE_METER_API_BASEURL = http://111.198.10.15:21606
 # VITE_APP_API_BASEURL = http://111.198.10.15:21611
 # VITE_APP_API_BASEURL = http://192.168.8.107:5909
 # VITE_APP_API_BASEURL = http://111.198.10.15:21710
diff --git a/public/config/config.json b/public/config/config.json
index cfca39a..ffd6d38 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,7 +1,7 @@
 {
   "title":"计量业务系统",
-  "baseUrl": "http://192.168.8.102:5909",
-  "baseUrlBusiness": "http://192.168.8.102:5909",
+  "baseUrl": "http://192.168.8.105:5909",
+  "baseUrlBusiness": "http://111.198.10.15:21606",
   "pathDict": {
     "fbfpsbgl":"/reviewpage/detail",
     "fbfmlgl":"/directorypage/detail",
diff --git a/src/api/eqpt/device/group.ts b/src/api/eqpt/device/group.ts
index d534327..d2c2999 100644
--- a/src/api/eqpt/device/group.ts
+++ b/src/api/eqpt/device/group.ts
@@ -3,11 +3,11 @@
  */
 import request from '@/api/index'
 // 分组列表
-export function getGroupList(params: object) {
+export function getGroupList(params: any) {
   return request({
-    url: '/equipment/group/listPage',
-    method: 'get',
-    params,
+    url: `/equipment/group/listPage?limit=${params.limit}&offset=${params.offset}`,
+    method: 'post',
+    data: params,
   })
 }
 // 编辑
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index a46fd4c..ca0ce73 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -161,3 +161,12 @@
     data,
   })
 }
+// 获取检定去向
+export function defaultCheckDestination(data: object) {
+  return request({
+    url: '/equipment/model/defaultCheckDestination',
+    method: 'get',
+    params: data,
+  })
+}
+
diff --git a/src/views/tested/device/info/components/edit.vue b/src/views/tested/device/info/components/edit.vue
index d310206..6d4c8d8 100644
--- a/src/views/tested/device/info/components/edit.vue
+++ b/src/views/tested/device/info/components/edit.vue
@@ -11,8 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { cancelInfo, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
-// import { getUserList } from '@/api/system/user'
+import { cancelInfo, defaultCheckDestination, deleteInfo, editInfo, getApprovalDetail, getInfoDetail, submitInfo } from '@/api/eqpt/device/info'
 import { getDictByCode } from '@/api/system/dict'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { uploadApi } from '@/api/system/notice'
@@ -28,8 +27,6 @@
 const userStore = useUserStore()
 const submitId = ref('未提交') // 提交id-保存接口获取
 const ruleFormRef = ref<FormInstance>() // from组件
-const ruleFormRef1 = ref<FormInstance>() // from组件
-const ruleFormRef2 = ref<FormInstance>() // from组件
 const statusName = $route.query.statusName as string
 const title = ref('')
 const isFrist = ref(true)
@@ -58,13 +55,13 @@
   createUserId: '', // 创建人id
   createUserName: '', // 创建人名字
   deptId: '', // 使用部门id
-  directorName: '', // 负责人
+  directorId: '', // 负责人
   equipmentId: '', // 设备id
   equipmentName: '', // 设备名称
   equipmentNo: '', // 设备编号
   equipmentType: $route.query.equipmentType as string, // 设备类型(1受检设备;2特种设备)
   id: '', //
-  installLocation: '', // 安装位置(选择)
+  installLocationId: '', // 安装位置(选择)
   installLocationExt: '', // 安装位置(自定义编写)
   instructionsFile: '', // 说明书(minio存储文件名)（多个用,拼接）
   level: '', // 等级(字典code)
@@ -87,17 +84,19 @@
   unitPrice: '', // 单价(万元)
   updateTime: '', // 更新时间
   usageStatus: '', // 使用状态(字典code)
-  usePosition: '', // 使用岗位
+  usePositionId: '', // 使用岗位
   useSign: '', // 在用信息(字典code)
   helpInstruction: '', // 辅助字段
   companyName: '',
   certificateList: [],
-  submission: '0', // 送检状态
+  checkDestination: '', // 检定去向
+  // submission: '0', // 送检状态
 }) // 表单
 // 是否展示检定机构等一行信息
+const submission = ref('0')
 const submissionShow = ref(false)
 // 送检状态
-watch(() => ruleForm.value.submission, (newVal) => {
+watch(() => submission.value, (newVal) => {
   if (newVal === '0') {
     submissionShow.value = false
   }
@@ -130,7 +129,7 @@
 })
 const radio = ref('基本信息')
 // 表单1验证规则
-const rules1 = ref<FormRules>({
+const rules = ref<FormRules>({
   equipmentName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
   equipmentNo: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
   usageStatus: [{ required: true, message: '使用状态必选', trigger: ['blur', 'change'] }],
@@ -142,23 +141,15 @@
   // 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'] }],
+  // 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'] }],
   // checkCycle: [{ required: true, message: '检定周期必填', trigger: ['blur', 'change'] }],
-})
-const rules2 = ref<FormRules>({
-  usePosition: [{ required: true, message: '使用岗位必填', trigger: ['blur', 'change'] }],
-  directorName: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
+  usePositionId: [{ required: true, message: '使用岗位必选', trigger: ['blur', 'change'] }],
+  directorId: [{ required: true, message: '负责人必填', trigger: ['blur', 'change'] }],
   useSign: [{ required: true, message: '在用信息必选', trigger: ['blur', 'change'] }],
 })
-const rules3 = ref<FormRules>({
-  // checkOrganization: [{ required: true, message: '检定机构必填', trigger: ['blur', 'change'] }],
-  // meterIdentify: [{ required: true, message: '计量标识必填', trigger: ['blur', 'change'] }],
-  // checkDate: [{ required: true, message: '检定(校准)日期必选', trigger: ['blur', 'change'] }],
-  // certificateValid: [{ required: true, message: '证书有效期必选', trigger: ['blur', 'change'] }],
-})
 // 获取下拉框数据
 const useStatusList = ref<{ id: string; value: string; name: string }[]>() // 使用状态
 const levelList = ref<{ id: string; value: string; name: string }[]>() // 设备重要等级
@@ -262,6 +253,7 @@
   }
 })
 // 设备相关，填充数据
+const companyId = ref('')
 watch(() => ruleForm.value, (newVal) => {
   if ($route.path.includes('detail') || isFrist.value) {
     return
@@ -277,6 +269,12 @@
       ruleForm.value.checkCycle = data.checkCycle
       ruleForm.value.modelId = data.id
       ruleForm.value.instructionsFile = data.instructionsFile
+      // 检定去向
+      defaultCheckDestination({ modelId: ruleForm.value.modelId, companyId: companyId.value }).then((res) => {
+        if (res.data) {
+          ruleForm.value.checkDestination = res.data
+        }
+      })
     }
   }
   // if ((helpList.value.length === 0 || (helpList.value.length === 1)) && ruleForm.value.model && ruleForm.value.equipmentName) {
@@ -295,15 +293,6 @@
   deep: true,
   immediate: true,
 })
-// 加载组织机构树形下拉
-const deptTreeList = ref()
-const fetchDeptTree = () => {
-  getDeptTreeList().then((res) => {
-    if (res.data) { // 将列表转树结构
-      deptTreeList.value = toTreeList(res.data, '0', true)
-    }
-  })
-}
 // 负责人
 const userList = ref<any[]>([])
 const getuser = () => {
@@ -312,14 +301,10 @@
   })
 }
 getuser()
-fetchDeptTree()
 // 弹窗初始化
 const initDialog = () => {
   dialogStatus.value = $route.params.type as string || 'detail'
   ruleFormRef.value?.resetFields()
-  ruleFormRef1.value?.resetFields()
-  ruleFormRef2.value?.resetFields()
-  console.log(userStore)
   if ($route.params.type === 'create') {
     isFrist.value = false
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
@@ -330,28 +315,23 @@
     testTask.value = ['']
     // 获取当前用户所在单位
     getUserDept().then((res) => {
-      console.log(res.data, '用户所在单位')
-      // fullName
       ruleForm.value.companyId = res.data.id
+      companyId.value = res.data.id
       ruleForm.value.companyName = res.data.fullName
     })
   }
   else {
-    // console.log(statusName, 'statusName')
+    const openSubmission = () => {
+      if (ruleForm.value.checkOrganization || ruleForm.value.checkDate || ruleForm.value.certificateValid || ruleForm.value.meterIdentify) {
+        submission.value = '1'
+      }
+      setTimeout(() => {
+        isFrist.value = false
+      }, 2000)
+    }
     if (statusName === '全部') {
       getInfoDetail({ equipmentId: $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 ($route.params.type === 'update') {
           ruleForm.value.approvalType = '2'
           ruleForm.value.approvalTypeName = '编辑设备'
@@ -361,30 +341,14 @@
           ruleForm.value.createUserName = userStore.name
           ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
         }
-        setTimeout(() => {
-          isFrist.value = false
-        }, 2000)
+        openSubmission()
       })
     }
     else {
       getApprovalDetail({ id: $route.query.id as string }).then((res) => {
         ruleForm.value = res.data
-        setTimeout(() => {
-          isFrist.value = false
-        }, 2000)
-        // if (ruleForm.value.testTask) {
-        //   if (ruleForm.value.testTask.includes(',')) {
-        //     testTask.value = ruleForm.value.testTask.split(',')
-        //   }
-        //   else {
-        //     testTask.value = [ruleForm.value.testTask]
-        //   }
-        // }
-        // else {
-        //   testTask.value = ['']
-        // }
+        openSubmission()
       })
-      // ruleForm.value = JSON.parse($route.query.row as string)
     }
   }
 }
@@ -407,10 +371,9 @@
 const certificateRef = ref()
 const disabledSave = ref(false)
 // 保存
-const saveForm = async (formEl: FormInstance | undefined, formEl1: FormInstance | undefined, formEl2: FormInstance | undefined) => {
-  console.log(formEl, formEl1)
-  if (!formEl || !formEl1 || !formEl2) { return }
-  Promise.all([formEl.validate(), formEl1.validate(), formEl2.validate()]).then(() => {
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  Promise.all([formEl.validate()]).then(() => {
     // 验证表格
     if (tableRef.value.checkCertificateList() && technologyRef.value.checkCertificateList()) {
       ElMessageBox.confirm(
@@ -425,9 +388,6 @@
         disabledSave.value = true
         ruleForm.value.attachments = tableRef.value.list
         ruleForm.value.technicalTargetList = technologyRef.value.list
-        // if (!ruleForm.value.groupInfos.length) {
-        //   ruleForm.value.groupInfos = null
-        // }
         if ($route.path.includes('speciallist')) {
           //  特种设备
           ruleForm.value.certificateList = certificateRef.value.list
@@ -447,6 +407,8 @@
           else {
             ElMessage.success('保存成功')
           }
+        }).catch(() => {
+          disabledSave.value = false
         })
       })
     }
@@ -484,23 +446,12 @@
 }
 // 编辑
 const editForm = () => {
-  // $route.params.type = dialogStatus.value
-  // mainPage.reload()
-  // $router.push({
-  //   path: `/dinfo/${dialogStatus.value}`,
-  //   query: {
-  //     row: $route.query.row,
-  //     statusName,
-  //   },
-  // })
-  // document.getElementById('reload-btn')?.click()
   $router.push({
     // params: { ...$route.params, type: 'update' },
     path: `/${$route.query.equipmentType === '1' ? 'dinfo' : 'speciallist'}/update`,
     query: { ...$route.query },
   })
   initDialog()
-  // document.getElementById('reload-btn')?.click()
 }
 // 删除
 const delForm = () => {
@@ -641,7 +592,7 @@
         <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
           提交
         </el-button>
-        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" :disabled="disabledSave" @click="saveForm(ruleFormRef, ruleFormRef1, ruleFormRef2)">
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" :disabled="disabledSave" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
@@ -663,8 +614,11 @@
     </detail-block-com>
     <!-- 基本信息 -->
     <div v-show="radio === '基本信息'">
-      <detail-block-com v-show="!$route.path.includes('detail')">
-        <el-form label-position="right" label-width="110px" class="form" :disable="$route.path.includes('detail')">
+      <el-form
+        ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" class="form"
+        :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
+      >
+        <detail-block-com v-show="!$route.path.includes('detail')">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="审批类型">
@@ -682,13 +636,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
-      <detail-block-com>
-        <el-form
-          ref="ruleFormRef" :model="ruleForm" :rules="rules1" label-position="right" label-width="110px" class="form"
-          :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')"
-        >
+        </detail-block-com>
+        <detail-block-com>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="设备名称" prop="equipmentName">
@@ -787,7 +736,7 @@
           <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%;" />
+                <dept-select v-model="ruleForm.deptId" :need-top="false" placeholder="选择使用部门" style="width: 100%;" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -815,9 +764,18 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="marg">
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="备注" prop="remark">
-                <el-input v-model.trim="ruleForm.remark" />
+                <el-input v-model.trim="ruleForm.remark" type="textarea" :rows="1" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定去向" prop="checkDestination">
+                <el-select v-model="ruleForm.checkDestination" placeholder="检定去向" style="width: 100%;">
+                  <!-- <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" /> -->
+                  <el-option label="计量室" value="1" />
+                  <el-option label="外送" value="2" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -828,7 +786,7 @@
             <el-col :span="6">
               <el-form-item label="设备送检状态">
                 <el-switch
-                  v-model="ruleForm.submission"
+                  v-model="submission"
                   size="large"
                   active-value="1"
                   inactive-value="0"
@@ -848,10 +806,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
-      <detail-block-com v-if="submissionShow">
-        <el-form ref="ruleFormRef2" :rules="rules3" label-position="right" label-width="130px" :model="ruleForm" class="form" :class="[$route.path.includes('detail') ? 'isDetail' : '']" :disabled="$route.path.includes('detail')">
+        </detail-block-com>
+        <detail-block-com v-if="submissionShow">
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
               <el-form-item label="检定(校准)机构" prop="checkOrganization">
@@ -883,24 +839,22 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </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')">
+        </detail-block-com>
+        <detail-block-com>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="使用岗位" prop="usePosition">
+              <el-form-item label="使用岗位" prop="usePositionId">
                 <!-- <el-input v-model.trim="ruleForm.usePosition" /> -->
-                <el-select v-model="ruleForm.usePosition" placeholder="使用岗位" clearable style="width: 100%;">
+                <el-select v-model="ruleForm.usePositionId" placeholder="使用岗位" clearable style="width: 100%;">
                   <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="负责人" prop="directorName">
+              <el-form-item label="负责人" prop="directorId">
                 <!-- <el-input v-model.trim="ruleForm.directorName" /> -->
-                <el-select v-model="ruleForm.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
-                  <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
+                <el-select v-model="ruleForm.directorId" filterable clearable placeholder="负责人" style="width: 100%;">
+                  <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
                     <span style="float: left;">{{ item.name }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                   </el-option>
@@ -937,9 +891,9 @@
           </el-row>
           <el-row :gutter="24" class="marg">
             <el-col :span="6">
-              <el-form-item label="安装位置" prop="installLocation">
+              <el-form-item label="安装位置" prop="installLocationId">
                 <!-- <el-input v-model.trim="ruleForm.installLocation" /> -->
-                <el-select v-model="ruleForm.installLocation" placeholder="安装位置" clearable style="width: 100%;">
+                <el-select v-model="ruleForm.installLocationId" placeholder="安装位置" clearable style="width: 100%;">
                   <el-option v-for="item in installLocationList" :key="item.id" :label="item.installLocation" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -990,8 +944,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-      </detail-block-com>
+        </detail-block-com>
+      </el-form>
       <detail-block-com>
         <technology ref="technologyRef" :data="ruleForm.technicalTargetList" :status="$route.params.type as string" />
       </detail-block-com>
diff --git a/src/views/tested/device/info/components/interface.ts b/src/views/tested/device/info/components/interface.ts
index 0807e07..e024d75 100644
--- a/src/views/tested/device/info/components/interface.ts
+++ b/src/views/tested/device/info/components/interface.ts
@@ -4,7 +4,7 @@
   certificateValidEnd: string
   deptIds: string
   usageStatus: string
-  usePosition: string // 使用岗位
+  usePositionId: string // 使用岗位
   equipmentNo: string
   equipmentName: string
   equipmentType: string
@@ -26,7 +26,8 @@
   sort: string
   orderBy: string
   manufacturer?: string
-  groupName?: string
+  groupId?: string
+  directorId?: 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 e21ec50..091c2f6 100644
--- a/src/views/tested/device/info/components/list.vue
+++ b/src/views/tested/device/info/components/list.vue
@@ -2,8 +2,8 @@
 <script lang="ts" setup name="DeviceInfoList">
 import { reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-
 import type { IlistObjType, IlistQueryType } from './interface'
+import useUserStore from '@/store/modules/user'
 import { delTextBtn, editTextBtn } from '@/utils/applyBtns'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { bindTaskHandler, cancelInfo, deleteInfo, editInfo, exportDevice, getInfoList, getInfoListPage, getInfoListTogether, importDevice, submitInfo } from '@/api/eqpt/device/info'
@@ -19,6 +19,7 @@
 import scanEquipmentDialog from '@/components/scanEquipmentDialog/index.vue'
 import { getLocationList } from '@/api/system/installation'
 import { getPostList } from '@/api/system/post'
+import { getGroupList } from '@/api/eqpt/device/group'
 const $props = defineProps({
   statusName: {
     type: String,
@@ -30,6 +31,7 @@
     default: '1',
   },
 })
+const userStore = useUserStore()
 const applyDict = ref<{ [key: string]: string }>({
   审批: '',
   草稿箱: '1',
@@ -55,7 +57,7 @@
   certificateValidEnd: '',
   deptIds: '', // 使用部门
   usageStatus: '', // 使用状态
-  usePosition: '', // 使用岗位
+  usePositionId: '', // 使用岗位
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   equipmentType: $props.equipmentType, // 设备类型(1受检设备;2特种设备)
@@ -77,7 +79,17 @@
   sort: '',
   orderBy: '',
   manufacturer: '', // 生产厂家
-  groupName: '', // 分组
+  groupId: '', // 分组
+  directorId: $props.statusName === '全部' ? userStore.id : '',
+})
+const checked = ref(true)
+watch(() => checked.value, (newVal) => {
+  if (newVal) {
+    listQuery.directorId = $props.statusName === '全部' ? userStore.id : ''
+  }
+  else {
+    listQuery.directorId = ''
+  }
 })
 const columns = ref([
   // {
@@ -110,21 +122,21 @@
     text: '生产厂家',
     value: 'manufacturer',
     align: 'center',
-    sortable: 'custom',
+    // sortable: 'custom',
     filters: true,
   },
   {
     text: '所在单位',
     value: 'companyName',
     align: 'center',
-    sortable: 'custom',
+    // sortable: 'custom',
     filters: true,
   },
   {
     text: '使用部门',
     value: 'deptName',
     align: 'center',
-    sortable: 'custom',
+    // sortable: 'custom',
     filters: true,
   },
   {
@@ -162,7 +174,6 @@
     text: '分组',
     value: 'groupName',
     align: 'center',
-    sortable: 'custom',
     filters: true,
   },
 ])
@@ -258,7 +269,12 @@
     // console.log('倒叙')
   }
   console.log(underlineToHump(column.prop), column.prop)
-  listQuery.orderBy = underlineToHump(column.prop)
+  let data = underlineToHump(column.prop)
+  if (data.split('_')[data.split('_').length - 1] === 'name') {
+    data = data.split('_').slice(0, data.split('_').length - 1).join('_')
+    console.log(data, 'data')
+  }
+  listQuery.orderBy = data
   fetchData()
 }
 // 获取使用状态列表
@@ -273,6 +289,8 @@
 const taskList = ref<{ id: string; value: string; name: string }[]>([])
 // 计量标识
 const meterIdentifyList = ref<{ id: string; value: string; name: string }[]>()
+// 分组
+const groupList = ref<{ id: string; value: string; name: string }[]>()
 // 安装位置
 const installLocationList = ref<any[]>([])
 // 使用岗位
@@ -322,6 +340,11 @@
   getUserList({ offset: 1, limit: 99999 }).then((res) => {
     userList.value = res.data.rows
   })
+  // 分组
+  getGroupList({ offset: 1, limit: 99999 }).then((res) => {
+    console.log(res.data, '分组')
+    groupList.value = res.data.rows.map((item: any) => ({ name: item.groupName, id: item.id, value: item.id }))
+  })
 }
 fetchUseStatus()
 // 监听设备名称下拉框，修改规格型号和辅助字段
@@ -367,7 +390,7 @@
   listQuery.equipmentNo = ''
   listQuery.equipmentName = ''
   listQuery.usageStatus = ''
-  listQuery.usePosition = ''
+  listQuery.usePositionId = ''
   listQuery.certificateValidEnd = ''
   listQuery.certificateValidStart = ''
   listQuery.model = ''
@@ -385,7 +408,9 @@
   listQuery.sort = ''
   listQuery.orderBy = ''
   listQuery.manufacturer = ''
-  listQuery.groupName = ''
+  listQuery.groupId = ''
+  listQuery.directorId = $props.statusName === '全部' ? userStore.id : ''
+  checked.value = true
   modelList.value = Array.from(new Set(allList.value.filter(item => item.model).map(item => item.model)))
   listQuery.offset = 1
   listQuery.limit = 20
@@ -527,6 +552,12 @@
 const $router = useRouter()
 // 新建编辑操作
 const handler = (row: IlistObjType, type: string) => {
+  // 当角色是操作手时，只有负责人是自己时可以编辑/删除
+  if ($props.statusName === '全部' && userStore.roleNames.includes('操作手') && type === 'update') {
+    if (row.directorName !== userStore.name) {
+      return
+    }
+  }
   $router.push({
     path: `/${$props.equipmentType === '1' ? 'dinfo' : 'speciallist'}/${type}`,
     query: {
@@ -660,6 +691,12 @@
 // 删除
 const delHandler = (row: IlistObjType) => {
   if ($props.statusName === '全部') {
+    // 当角色是操作手时，只有负责人是自己时可以编辑/删除
+    if (userStore.roleNames.includes('操作手')) {
+      if (row.directorName !== userStore.name) {
+        return
+      }
+    }
     // 删除设备
     ElMessageBox.prompt('请填写删除原因', '确认删除', {
       confirmButtonText: '确认',
@@ -825,10 +862,10 @@
         <el-input v-model.trim="listQuery.manufacturer" placeholder="生产厂家" clearable />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.companyId" placeholder="所在单位" />
+        <dept-select v-model="listQuery.companyId" :need-top="false" placeholder="所在单位" />
       </search-item>
       <search-item>
-        <dept-select v-model="listQuery.deptIds" placeholder="使用部门" />
+        <dept-select v-model="listQuery.deptIds" :need-top="false" placeholder="使用部门" />
       </search-item>
       <search-item>
         <el-select v-model="listQuery.meterIdentify" placeholder="计量标识" clearable>
@@ -848,7 +885,7 @@
         <search-item>
           <!-- <el-input v-model.trim="listQuery.directorName" placeholder="负责人" clearable /> -->
           <el-select v-model="listQuery.directorName" filterable clearable placeholder="负责人" style="width: 100%;">
-            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id">
+            <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.name">
               <span style="float: left;">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
             </el-option>
@@ -873,7 +910,7 @@
         </search-item>
         <search-item>
           <!-- <el-input v-model.trim="listQuery.usePosition" placeholder="使用岗位" clearable /> -->
-          <el-select v-model="listQuery.usePosition" placeholder="使用岗位" clearable>
+          <el-select v-model="listQuery.usePositionId" placeholder="使用岗位" clearable>
             <el-option v-for="item in usePositionList" :key="item.id" :label="item.positionName" :value="item.id" />
           </el-select>
         </search-item>
@@ -889,10 +926,13 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-input v-model.trim="listQuery.groupName" placeholder="分组" clearable />
+          <el-select v-model="listQuery.groupId" placeholder="分组" clearable>
+            <el-option v-for="item in groupList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
+          <!-- <el-input v-model.trim="listQuery.groupId" placeholder="分组" clearable /> -->
         </search-item>
-        <search-item>
-          <el-checkbox v-model="listQuery.checked1" size="large" checked>只看我负责的</el-checkbox>
+        <search-item v-show="$props.statusName === '全部'">
+          <el-checkbox v-model="checked" size="large" checked>只看我负责的</el-checkbox>
         </search-item>
         <!-- <search-item>
           <el-select v-model="listQuery.useSign" placeholder="在用信息" clearable>
diff --git a/src/views/tested/device/info/components/table.vue b/src/views/tested/device/info/components/table.vue
index b9792df..4f08020 100644
--- a/src/views/tested/device/info/components/table.vue
+++ b/src/views/tested/device/info/components/table.vue
@@ -20,13 +20,13 @@
   {
     text: '信息',
     value: 'information',
-    required: true,
+    required: false,
     isSelect: false, // 是否下拉框
   },
   {
     text: '位置',
     value: 'position',
-    required: true,
+    required: false,
     isSelect: false, // 是否下拉框
   },
 ])