diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index 738a05c..7a2bb72 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index 738a05c..7a2bb72 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
diff --git a/src/views/workbench/components/buttonSet.vue b/src/views/workbench/components/buttonSet.vue
index d3c1a6c..7f77348 100644
--- a/src/views/workbench/components/buttonSet.vue
+++ b/src/views/workbench/components/buttonSet.vue
@@ -1,6 +1,12 @@
 <!-- 按钮集合 -->
 <script lang="ts" setup name="ButtonSet">
 import { ElMessage } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+
+const user = useUserStore() // 用户信息
+const showEmpty = ref(false)
+const emptyDisc = ref('') // 描述文字
+const isAdministrator = ref('0') // 是不是超级管理员
 const $router = useRouter()
 const buttons = [
   {
@@ -68,10 +74,24 @@
 const changePage = (path: string) => {
   $router.push(path)
 }
+
+onMounted(() => {
+  isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '0' && !user.bizLabCode) { // 不是超级管理员、没有实验室
+    emptyDisc.value = '此用户非超级管理员且无实验室，无权限查看'
+    showEmpty.value = true
+  }
+  if (isAdministrator.value === '0' && user.bizLabCode && !user.groupNo) { // 有实验室但没有组
+    emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
+    showEmpty.value = true
+  }
+})
 </script>
 
 <template>
-  <div style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
+  <el-empty v-show="showEmpty" style="height: 100%;" :image-size="50" :description="emptyDisc" />
+  <div v-show="!showEmpty" style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
     <div v-for="item in buttons" :key="item.id" style="flex: 0 0 25%;" class="buttonSet-button" :style="`background: ${item.color}`" @click="changePage(item.path)">
       {{ item.name }}
     </div>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index 738a05c..7a2bb72 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
diff --git a/src/views/workbench/components/buttonSet.vue b/src/views/workbench/components/buttonSet.vue
index d3c1a6c..7f77348 100644
--- a/src/views/workbench/components/buttonSet.vue
+++ b/src/views/workbench/components/buttonSet.vue
@@ -1,6 +1,12 @@
 <!-- 按钮集合 -->
 <script lang="ts" setup name="ButtonSet">
 import { ElMessage } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+
+const user = useUserStore() // 用户信息
+const showEmpty = ref(false)
+const emptyDisc = ref('') // 描述文字
+const isAdministrator = ref('0') // 是不是超级管理员
 const $router = useRouter()
 const buttons = [
   {
@@ -68,10 +74,24 @@
 const changePage = (path: string) => {
   $router.push(path)
 }
+
+onMounted(() => {
+  isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '0' && !user.bizLabCode) { // 不是超级管理员、没有实验室
+    emptyDisc.value = '此用户非超级管理员且无实验室，无权限查看'
+    showEmpty.value = true
+  }
+  if (isAdministrator.value === '0' && user.bizLabCode && !user.groupNo) { // 有实验室但没有组
+    emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
+    showEmpty.value = true
+  }
+})
 </script>
 
 <template>
-  <div style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
+  <el-empty v-show="showEmpty" style="height: 100%;" :image-size="50" :description="emptyDisc" />
+  <div v-show="!showEmpty" style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
     <div v-for="item in buttons" :key="item.id" style="flex: 0 0 25%;" class="buttonSet-button" :style="`background: ${item.color}`" @click="changePage(item.path)">
       {{ item.name }}
     </div>
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 29e56b9..0102188 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -43,14 +43,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -67,8 +67,8 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -104,8 +104,8 @@
     standardEquipmentName: '', // 被核查标准装置名称
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
-    labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 部门
+    labCode: labCode.value === 'A' ? null : labCode.value, // 实验室
+    groupCode: groupCode.value === 'A' ? null : groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -133,8 +133,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -151,7 +151,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -169,11 +169,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index 738a05c..7a2bb72 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
diff --git a/src/views/workbench/components/buttonSet.vue b/src/views/workbench/components/buttonSet.vue
index d3c1a6c..7f77348 100644
--- a/src/views/workbench/components/buttonSet.vue
+++ b/src/views/workbench/components/buttonSet.vue
@@ -1,6 +1,12 @@
 <!-- 按钮集合 -->
 <script lang="ts" setup name="ButtonSet">
 import { ElMessage } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+
+const user = useUserStore() // 用户信息
+const showEmpty = ref(false)
+const emptyDisc = ref('') // 描述文字
+const isAdministrator = ref('0') // 是不是超级管理员
 const $router = useRouter()
 const buttons = [
   {
@@ -68,10 +74,24 @@
 const changePage = (path: string) => {
   $router.push(path)
 }
+
+onMounted(() => {
+  isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '0' && !user.bizLabCode) { // 不是超级管理员、没有实验室
+    emptyDisc.value = '此用户非超级管理员且无实验室，无权限查看'
+    showEmpty.value = true
+  }
+  if (isAdministrator.value === '0' && user.bizLabCode && !user.groupNo) { // 有实验室但没有组
+    emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
+    showEmpty.value = true
+  }
+})
 </script>
 
 <template>
-  <div style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
+  <el-empty v-show="showEmpty" style="height: 100%;" :image-size="50" :description="emptyDisc" />
+  <div v-show="!showEmpty" style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
     <div v-for="item in buttons" :key="item.id" style="flex: 0 0 25%;" class="buttonSet-button" :style="`background: ${item.color}`" @click="changePage(item.path)">
       {{ item.name }}
     </div>
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 29e56b9..0102188 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -43,14 +43,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -67,8 +67,8 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -104,8 +104,8 @@
     standardEquipmentName: '', // 被核查标准装置名称
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
-    labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 部门
+    labCode: labCode.value === 'A' ? null : labCode.value, // 实验室
+    groupCode: groupCode.value === 'A' ? null : groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -133,8 +133,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -151,7 +151,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -169,11 +169,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index dadc6db..76eb233 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -72,14 +72,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -110,8 +110,8 @@
  */
 function fetchDistributedData(type: 'distributed' | 'overdue') {
   listQueryDistributed.value.sampleStatus = type === 'distributed' ? '2' : '8'
-  listQueryDistributed.value.labCode = labCode.value
-  listQueryDistributed.value.groupCode = groupCode.value
+  listQueryDistributed.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryDistributed.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getTaskList(listQueryDistributed.value).then((response) => {
     const tempList = response.data.rows.map((item: { realDeliverTime: string; requireOverTime: string }) => {
@@ -165,8 +165,8 @@
 // 数据查询
 function fetchMeasureData() {
   listQueryMeasure.value.glStaff = user.groupNo === 'GL' ? '1' : '0'
-  listQueryMeasure.value.labCode = labCode.value
-  listQueryMeasure.value.groupCode = groupCode.value
+  listQueryMeasure.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryMeasure.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getDeptMeasureList(listQueryMeasure.value).then((res) => {
     measureList.value = res.data.rows.map((item: any) => {
@@ -226,8 +226,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     controlMenu()
     fetchData()
   }
@@ -245,7 +245,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -264,11 +264,11 @@
   <el-empty v-show="showEmpty" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index 738a05c..7a2bb72 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
diff --git a/src/views/workbench/components/buttonSet.vue b/src/views/workbench/components/buttonSet.vue
index d3c1a6c..7f77348 100644
--- a/src/views/workbench/components/buttonSet.vue
+++ b/src/views/workbench/components/buttonSet.vue
@@ -1,6 +1,12 @@
 <!-- 按钮集合 -->
 <script lang="ts" setup name="ButtonSet">
 import { ElMessage } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+
+const user = useUserStore() // 用户信息
+const showEmpty = ref(false)
+const emptyDisc = ref('') // 描述文字
+const isAdministrator = ref('0') // 是不是超级管理员
 const $router = useRouter()
 const buttons = [
   {
@@ -68,10 +74,24 @@
 const changePage = (path: string) => {
   $router.push(path)
 }
+
+onMounted(() => {
+  isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '0' && !user.bizLabCode) { // 不是超级管理员、没有实验室
+    emptyDisc.value = '此用户非超级管理员且无实验室，无权限查看'
+    showEmpty.value = true
+  }
+  if (isAdministrator.value === '0' && user.bizLabCode && !user.groupNo) { // 有实验室但没有组
+    emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
+    showEmpty.value = true
+  }
+})
 </script>
 
 <template>
-  <div style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
+  <el-empty v-show="showEmpty" style="height: 100%;" :image-size="50" :description="emptyDisc" />
+  <div v-show="!showEmpty" style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
     <div v-for="item in buttons" :key="item.id" style="flex: 0 0 25%;" class="buttonSet-button" :style="`background: ${item.color}`" @click="changePage(item.path)">
       {{ item.name }}
     </div>
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 29e56b9..0102188 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -43,14 +43,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -67,8 +67,8 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -104,8 +104,8 @@
     standardEquipmentName: '', // 被核查标准装置名称
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
-    labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 部门
+    labCode: labCode.value === 'A' ? null : labCode.value, // 实验室
+    groupCode: groupCode.value === 'A' ? null : groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -133,8 +133,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -151,7 +151,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -169,11 +169,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index dadc6db..76eb233 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -72,14 +72,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -110,8 +110,8 @@
  */
 function fetchDistributedData(type: 'distributed' | 'overdue') {
   listQueryDistributed.value.sampleStatus = type === 'distributed' ? '2' : '8'
-  listQueryDistributed.value.labCode = labCode.value
-  listQueryDistributed.value.groupCode = groupCode.value
+  listQueryDistributed.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryDistributed.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getTaskList(listQueryDistributed.value).then((response) => {
     const tempList = response.data.rows.map((item: { realDeliverTime: string; requireOverTime: string }) => {
@@ -165,8 +165,8 @@
 // 数据查询
 function fetchMeasureData() {
   listQueryMeasure.value.glStaff = user.groupNo === 'GL' ? '1' : '0'
-  listQueryMeasure.value.labCode = labCode.value
-  listQueryMeasure.value.groupCode = groupCode.value
+  listQueryMeasure.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryMeasure.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getDeptMeasureList(listQueryMeasure.value).then((res) => {
     measureList.value = res.data.rows.map((item: any) => {
@@ -226,8 +226,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     controlMenu()
     fetchData()
   }
@@ -245,7 +245,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -264,11 +264,11 @@
   <el-empty v-show="showEmpty" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index 8dd70c8..366b5e0 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -58,14 +58,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -76,8 +76,8 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -95,8 +95,8 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -115,8 +115,8 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -132,8 +132,8 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -164,8 +164,8 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data) {
@@ -196,8 +196,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -214,7 +214,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -232,11 +232,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-equipment-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index 738a05c..7a2bb72 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
diff --git a/src/views/workbench/components/buttonSet.vue b/src/views/workbench/components/buttonSet.vue
index d3c1a6c..7f77348 100644
--- a/src/views/workbench/components/buttonSet.vue
+++ b/src/views/workbench/components/buttonSet.vue
@@ -1,6 +1,12 @@
 <!-- 按钮集合 -->
 <script lang="ts" setup name="ButtonSet">
 import { ElMessage } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+
+const user = useUserStore() // 用户信息
+const showEmpty = ref(false)
+const emptyDisc = ref('') // 描述文字
+const isAdministrator = ref('0') // 是不是超级管理员
 const $router = useRouter()
 const buttons = [
   {
@@ -68,10 +74,24 @@
 const changePage = (path: string) => {
   $router.push(path)
 }
+
+onMounted(() => {
+  isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '0' && !user.bizLabCode) { // 不是超级管理员、没有实验室
+    emptyDisc.value = '此用户非超级管理员且无实验室，无权限查看'
+    showEmpty.value = true
+  }
+  if (isAdministrator.value === '0' && user.bizLabCode && !user.groupNo) { // 有实验室但没有组
+    emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
+    showEmpty.value = true
+  }
+})
 </script>
 
 <template>
-  <div style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
+  <el-empty v-show="showEmpty" style="height: 100%;" :image-size="50" :description="emptyDisc" />
+  <div v-show="!showEmpty" style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
     <div v-for="item in buttons" :key="item.id" style="flex: 0 0 25%;" class="buttonSet-button" :style="`background: ${item.color}`" @click="changePage(item.path)">
       {{ item.name }}
     </div>
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 29e56b9..0102188 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -43,14 +43,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -67,8 +67,8 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -104,8 +104,8 @@
     standardEquipmentName: '', // 被核查标准装置名称
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
-    labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 部门
+    labCode: labCode.value === 'A' ? null : labCode.value, // 实验室
+    groupCode: groupCode.value === 'A' ? null : groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -133,8 +133,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -151,7 +151,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -169,11 +169,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index dadc6db..76eb233 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -72,14 +72,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -110,8 +110,8 @@
  */
 function fetchDistributedData(type: 'distributed' | 'overdue') {
   listQueryDistributed.value.sampleStatus = type === 'distributed' ? '2' : '8'
-  listQueryDistributed.value.labCode = labCode.value
-  listQueryDistributed.value.groupCode = groupCode.value
+  listQueryDistributed.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryDistributed.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getTaskList(listQueryDistributed.value).then((response) => {
     const tempList = response.data.rows.map((item: { realDeliverTime: string; requireOverTime: string }) => {
@@ -165,8 +165,8 @@
 // 数据查询
 function fetchMeasureData() {
   listQueryMeasure.value.glStaff = user.groupNo === 'GL' ? '1' : '0'
-  listQueryMeasure.value.labCode = labCode.value
-  listQueryMeasure.value.groupCode = groupCode.value
+  listQueryMeasure.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryMeasure.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getDeptMeasureList(listQueryMeasure.value).then((res) => {
     measureList.value = res.data.rows.map((item: any) => {
@@ -226,8 +226,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     controlMenu()
     fetchData()
   }
@@ -245,7 +245,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -264,11 +264,11 @@
   <el-empty v-show="showEmpty" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index 8dd70c8..366b5e0 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -58,14 +58,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -76,8 +76,8 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -95,8 +95,8 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -115,8 +115,8 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -132,8 +132,8 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -164,8 +164,8 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data) {
@@ -196,8 +196,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -214,7 +214,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -232,11 +232,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-equipment-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->
diff --git a/src/views/workbench/components/measureManage.vue b/src/views/workbench/components/measureManage.vue
index fa17ce3..9fdf0cc 100644
--- a/src/views/workbench/components/measureManage.vue
+++ b/src/views/workbench/components/measureManage.vue
@@ -44,14 +44,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -62,8 +62,8 @@
   // 设备类型分析
   getMeasureDevice({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -86,8 +86,8 @@
 const fetchMeasureConclusion = (startDate = '', endDate = '') => {
   getMeasureConclusion({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -109,8 +109,8 @@
 const fetchertAmount = () => {
   getCertAmount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -160,8 +160,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -178,7 +178,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -196,11 +196,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index 738a05c..7a2bb72 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
diff --git a/src/views/workbench/components/buttonSet.vue b/src/views/workbench/components/buttonSet.vue
index d3c1a6c..7f77348 100644
--- a/src/views/workbench/components/buttonSet.vue
+++ b/src/views/workbench/components/buttonSet.vue
@@ -1,6 +1,12 @@
 <!-- 按钮集合 -->
 <script lang="ts" setup name="ButtonSet">
 import { ElMessage } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+
+const user = useUserStore() // 用户信息
+const showEmpty = ref(false)
+const emptyDisc = ref('') // 描述文字
+const isAdministrator = ref('0') // 是不是超级管理员
 const $router = useRouter()
 const buttons = [
   {
@@ -68,10 +74,24 @@
 const changePage = (path: string) => {
   $router.push(path)
 }
+
+onMounted(() => {
+  isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '0' && !user.bizLabCode) { // 不是超级管理员、没有实验室
+    emptyDisc.value = '此用户非超级管理员且无实验室，无权限查看'
+    showEmpty.value = true
+  }
+  if (isAdministrator.value === '0' && user.bizLabCode && !user.groupNo) { // 有实验室但没有组
+    emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
+    showEmpty.value = true
+  }
+})
 </script>
 
 <template>
-  <div style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
+  <el-empty v-show="showEmpty" style="height: 100%;" :image-size="50" :description="emptyDisc" />
+  <div v-show="!showEmpty" style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
     <div v-for="item in buttons" :key="item.id" style="flex: 0 0 25%;" class="buttonSet-button" :style="`background: ${item.color}`" @click="changePage(item.path)">
       {{ item.name }}
     </div>
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 29e56b9..0102188 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -43,14 +43,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -67,8 +67,8 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -104,8 +104,8 @@
     standardEquipmentName: '', // 被核查标准装置名称
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
-    labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 部门
+    labCode: labCode.value === 'A' ? null : labCode.value, // 实验室
+    groupCode: groupCode.value === 'A' ? null : groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -133,8 +133,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -151,7 +151,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -169,11 +169,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index dadc6db..76eb233 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -72,14 +72,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -110,8 +110,8 @@
  */
 function fetchDistributedData(type: 'distributed' | 'overdue') {
   listQueryDistributed.value.sampleStatus = type === 'distributed' ? '2' : '8'
-  listQueryDistributed.value.labCode = labCode.value
-  listQueryDistributed.value.groupCode = groupCode.value
+  listQueryDistributed.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryDistributed.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getTaskList(listQueryDistributed.value).then((response) => {
     const tempList = response.data.rows.map((item: { realDeliverTime: string; requireOverTime: string }) => {
@@ -165,8 +165,8 @@
 // 数据查询
 function fetchMeasureData() {
   listQueryMeasure.value.glStaff = user.groupNo === 'GL' ? '1' : '0'
-  listQueryMeasure.value.labCode = labCode.value
-  listQueryMeasure.value.groupCode = groupCode.value
+  listQueryMeasure.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryMeasure.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getDeptMeasureList(listQueryMeasure.value).then((res) => {
     measureList.value = res.data.rows.map((item: any) => {
@@ -226,8 +226,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     controlMenu()
     fetchData()
   }
@@ -245,7 +245,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -264,11 +264,11 @@
   <el-empty v-show="showEmpty" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index 8dd70c8..366b5e0 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -58,14 +58,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -76,8 +76,8 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -95,8 +95,8 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -115,8 +115,8 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -132,8 +132,8 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -164,8 +164,8 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data) {
@@ -196,8 +196,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -214,7 +214,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -232,11 +232,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-equipment-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->
diff --git a/src/views/workbench/components/measureManage.vue b/src/views/workbench/components/measureManage.vue
index fa17ce3..9fdf0cc 100644
--- a/src/views/workbench/components/measureManage.vue
+++ b/src/views/workbench/components/measureManage.vue
@@ -44,14 +44,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -62,8 +62,8 @@
   // 设备类型分析
   getMeasureDevice({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -86,8 +86,8 @@
 const fetchMeasureConclusion = (startDate = '', endDate = '') => {
   getMeasureConclusion({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -109,8 +109,8 @@
 const fetchertAmount = () => {
   getCertAmount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -160,8 +160,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -178,7 +178,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -196,11 +196,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/noveltySearch.vue b/src/views/workbench/components/noveltySearch.vue
index b1d8821..cee7e45 100644
--- a/src/views/workbench/components/noveltySearch.vue
+++ b/src/views/workbench/components/noveltySearch.vue
@@ -16,10 +16,15 @@
   labCode: '',
 })
 const show = ref('')
-// 获取数据
+// 获取数据-查新记录表
 const fetchData = () => {
   loading.value = true
-  showBenchNovelty(query.value).then((res) => {
+  const params = {
+    fileId: query.value.fileId,
+    groupCode: query.value.groupCode === 'A' ? null : query.value.groupCode,
+    labCode: query.value.labCode === 'A' ? null : query.value.labCode,
+  }
+  showBenchNovelty(params).then((res) => {
     methodList.value = res.data.rows
     if (methodList.value.length) {
       show.value = methodList.value[0].id
@@ -34,9 +39,33 @@
 }
 onMounted(() => {
   // 判断是否超级管理员
+  // isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  // if (isAdministrator.value === '0') { // 不是
+  //   query.value.labCode = user.bizLabCode
+  // }
+  // else { // 是
+  //   query.value.labCode = 'A'
+  // }
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
-  if (isAdministrator.value === '0') {
-    query.value.labCode = user.bizLabCode
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '1') { // 超级管理员
+    query.value.labCode = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    query.value.groupCode = 'A' // 超级管理员默认查看全部
+  }
+  else { // 不是超级管理员
+    if (user.bizLabCode && user.groupNo) { // 没有实验室
+      if (user.groupNo === 'GL') { // 综合管理组
+        query.value.labCode = user.bizLabCode // 实验室
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
+        query.value.groupCode = 'A'
+        // 综合管理组可以查看待分发
+      }
+      else { // 其他组
+        query.value.labCode = user.bizLabCode // 实验室
+        // 其他组默认筛选自己组
+        query.value.groupCode = user.groupNo
+      }
+    }
   }
   fetchData()
 })
@@ -55,18 +84,18 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: '',
+      value: 'A',
     })
   })
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
     labCodeList.value.unshift({
-      id: 'all',
-      name: '全部',
-      value: '',
+      id: 'A',
+      name: '全站',
+      value: 'A',
     })
   })
 }
@@ -107,21 +136,21 @@
 </script>
 
 <template>
-  <div style="display: flex;align-items: center;">
+  <div v-show="!showEmpty" style="display: flex;align-items: center;">
     <div class="title" style="margin-right: 10px;">
       测试校准检定方法查新进度
     </div>
     <!-- 实验室下拉框 -->
     <el-select
-      v-if="isAdministrator === '1'" v-model="query.labCode" style="width: 130px;" class="short-input"
-      placeholder="实验室" clearable @change="fetchData"
+      v-model="query.labCode" :disabled="isAdministrator === '0'" style="width: 130px;" class="short-input"
+      placeholder="实验室" @change="fetchData"
     >
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 部门 -->
     <el-select
-      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
-      clearable @change="fetchData"
+      v-model="query.groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
+      @change="fetchData"
     >
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index 738a05c..7a2bb72 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
diff --git a/src/views/workbench/components/buttonSet.vue b/src/views/workbench/components/buttonSet.vue
index d3c1a6c..7f77348 100644
--- a/src/views/workbench/components/buttonSet.vue
+++ b/src/views/workbench/components/buttonSet.vue
@@ -1,6 +1,12 @@
 <!-- 按钮集合 -->
 <script lang="ts" setup name="ButtonSet">
 import { ElMessage } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+
+const user = useUserStore() // 用户信息
+const showEmpty = ref(false)
+const emptyDisc = ref('') // 描述文字
+const isAdministrator = ref('0') // 是不是超级管理员
 const $router = useRouter()
 const buttons = [
   {
@@ -68,10 +74,24 @@
 const changePage = (path: string) => {
   $router.push(path)
 }
+
+onMounted(() => {
+  isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '0' && !user.bizLabCode) { // 不是超级管理员、没有实验室
+    emptyDisc.value = '此用户非超级管理员且无实验室，无权限查看'
+    showEmpty.value = true
+  }
+  if (isAdministrator.value === '0' && user.bizLabCode && !user.groupNo) { // 有实验室但没有组
+    emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
+    showEmpty.value = true
+  }
+})
 </script>
 
 <template>
-  <div style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
+  <el-empty v-show="showEmpty" style="height: 100%;" :image-size="50" :description="emptyDisc" />
+  <div v-show="!showEmpty" style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
     <div v-for="item in buttons" :key="item.id" style="flex: 0 0 25%;" class="buttonSet-button" :style="`background: ${item.color}`" @click="changePage(item.path)">
       {{ item.name }}
     </div>
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 29e56b9..0102188 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -43,14 +43,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -67,8 +67,8 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -104,8 +104,8 @@
     standardEquipmentName: '', // 被核查标准装置名称
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
-    labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 部门
+    labCode: labCode.value === 'A' ? null : labCode.value, // 实验室
+    groupCode: groupCode.value === 'A' ? null : groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -133,8 +133,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -151,7 +151,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -169,11 +169,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index dadc6db..76eb233 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -72,14 +72,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -110,8 +110,8 @@
  */
 function fetchDistributedData(type: 'distributed' | 'overdue') {
   listQueryDistributed.value.sampleStatus = type === 'distributed' ? '2' : '8'
-  listQueryDistributed.value.labCode = labCode.value
-  listQueryDistributed.value.groupCode = groupCode.value
+  listQueryDistributed.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryDistributed.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getTaskList(listQueryDistributed.value).then((response) => {
     const tempList = response.data.rows.map((item: { realDeliverTime: string; requireOverTime: string }) => {
@@ -165,8 +165,8 @@
 // 数据查询
 function fetchMeasureData() {
   listQueryMeasure.value.glStaff = user.groupNo === 'GL' ? '1' : '0'
-  listQueryMeasure.value.labCode = labCode.value
-  listQueryMeasure.value.groupCode = groupCode.value
+  listQueryMeasure.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryMeasure.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getDeptMeasureList(listQueryMeasure.value).then((res) => {
     measureList.value = res.data.rows.map((item: any) => {
@@ -226,8 +226,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     controlMenu()
     fetchData()
   }
@@ -245,7 +245,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -264,11 +264,11 @@
   <el-empty v-show="showEmpty" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index 8dd70c8..366b5e0 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -58,14 +58,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -76,8 +76,8 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -95,8 +95,8 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -115,8 +115,8 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -132,8 +132,8 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -164,8 +164,8 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data) {
@@ -196,8 +196,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -214,7 +214,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -232,11 +232,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-equipment-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->
diff --git a/src/views/workbench/components/measureManage.vue b/src/views/workbench/components/measureManage.vue
index fa17ce3..9fdf0cc 100644
--- a/src/views/workbench/components/measureManage.vue
+++ b/src/views/workbench/components/measureManage.vue
@@ -44,14 +44,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -62,8 +62,8 @@
   // 设备类型分析
   getMeasureDevice({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -86,8 +86,8 @@
 const fetchMeasureConclusion = (startDate = '', endDate = '') => {
   getMeasureConclusion({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -109,8 +109,8 @@
 const fetchertAmount = () => {
   getCertAmount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -160,8 +160,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -178,7 +178,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -196,11 +196,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/noveltySearch.vue b/src/views/workbench/components/noveltySearch.vue
index b1d8821..cee7e45 100644
--- a/src/views/workbench/components/noveltySearch.vue
+++ b/src/views/workbench/components/noveltySearch.vue
@@ -16,10 +16,15 @@
   labCode: '',
 })
 const show = ref('')
-// 获取数据
+// 获取数据-查新记录表
 const fetchData = () => {
   loading.value = true
-  showBenchNovelty(query.value).then((res) => {
+  const params = {
+    fileId: query.value.fileId,
+    groupCode: query.value.groupCode === 'A' ? null : query.value.groupCode,
+    labCode: query.value.labCode === 'A' ? null : query.value.labCode,
+  }
+  showBenchNovelty(params).then((res) => {
     methodList.value = res.data.rows
     if (methodList.value.length) {
       show.value = methodList.value[0].id
@@ -34,9 +39,33 @@
 }
 onMounted(() => {
   // 判断是否超级管理员
+  // isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  // if (isAdministrator.value === '0') { // 不是
+  //   query.value.labCode = user.bizLabCode
+  // }
+  // else { // 是
+  //   query.value.labCode = 'A'
+  // }
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
-  if (isAdministrator.value === '0') {
-    query.value.labCode = user.bizLabCode
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '1') { // 超级管理员
+    query.value.labCode = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    query.value.groupCode = 'A' // 超级管理员默认查看全部
+  }
+  else { // 不是超级管理员
+    if (user.bizLabCode && user.groupNo) { // 没有实验室
+      if (user.groupNo === 'GL') { // 综合管理组
+        query.value.labCode = user.bizLabCode // 实验室
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
+        query.value.groupCode = 'A'
+        // 综合管理组可以查看待分发
+      }
+      else { // 其他组
+        query.value.labCode = user.bizLabCode // 实验室
+        // 其他组默认筛选自己组
+        query.value.groupCode = user.groupNo
+      }
+    }
   }
   fetchData()
 })
@@ -55,18 +84,18 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: '',
+      value: 'A',
     })
   })
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
     labCodeList.value.unshift({
-      id: 'all',
-      name: '全部',
-      value: '',
+      id: 'A',
+      name: '全站',
+      value: 'A',
     })
   })
 }
@@ -107,21 +136,21 @@
 </script>
 
 <template>
-  <div style="display: flex;align-items: center;">
+  <div v-show="!showEmpty" style="display: flex;align-items: center;">
     <div class="title" style="margin-right: 10px;">
       测试校准检定方法查新进度
     </div>
     <!-- 实验室下拉框 -->
     <el-select
-      v-if="isAdministrator === '1'" v-model="query.labCode" style="width: 130px;" class="short-input"
-      placeholder="实验室" clearable @change="fetchData"
+      v-model="query.labCode" :disabled="isAdministrator === '0'" style="width: 130px;" class="short-input"
+      placeholder="实验室" @change="fetchData"
     >
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 部门 -->
     <el-select
-      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
-      clearable @change="fetchData"
+      v-model="query.groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
+      @change="fetchData"
     >
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
diff --git a/src/views/workbench/components/progressBar.vue b/src/views/workbench/components/progressBar.vue
deleted file mode 100644
index 561910f..0000000
--- a/src/views/workbench/components/progressBar.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<!-- 进度 -->
-<script lang="ts" setup name="ProgressBar">
-import { ElMessage } from 'element-plus'
-import { detailQualityRegistration } from '@/api/quality/internal/registration'
-const $router = useRouter()
-// 内部审核进度
-const scheduleList = ref([
-  {
-    stageType: '1',
-    stageTypeName: '内审组建立',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '2',
-    stageTypeName: '内部审核计划公示',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '3',
-    stageTypeName: '《内部审核检查表》编制',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '4',
-    stageTypeName: '首次会议',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-    scheduleFileList: [] as any[],
-  },
-  {
-    stageType: '5',
-    stageTypeName: '现场审核',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '6',
-    stageTypeName: '内审组内部会议',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-    scheduleFileList: [] as any[],
-  },
-  {
-    stageType: '7',
-    stageTypeName: '交换意见',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '8',
-    stageTypeName: '末次会议',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-    scheduleFileList: [] as any[],
-  },
-  {
-    stageType: '9',
-    stageTypeName: '措施制定',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '10',
-    stageTypeName: '措施实施',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '11',
-    stageTypeName: '效果验证',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '12',
-    stageTypeName: '记录存档',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-]) as any
-</script>
-
-<template>
-  <div class="workbench-content-pro-container">
-    <div v-for="(item) in scheduleList" :key="item.stageTypeName" class="content-pro">
-      <div class="circle" :class="item.isCompleted === '1' ? 'true' : 'false'" />
-      <div class="name">
-        {{ item.stageTypeName }}
-      </div>
-      <div class="time">
-        {{ item.scheduleTime }}
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.workbench-content-pro-container {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  margin-top: 15px;
-  position: relative;
-
-  &::after {
-    display: block;
-    content: "";
-    width: 90%;
-    height: 3px;
-    background-color: #5d93ff;
-    position: absolute;
-    top: 6px;
-    z-index: 1;
-    padding: 0 15px;
-    left: 50%;
-    transform: translateX(-50%);
-  }
-
-  .content-pro {
-    text-align: center;
-    position: relative;
-    z-index: 2;
-
-    .circle {
-      width: 15px;
-      height: 15px;
-      border-radius: 50%;
-      margin: 0 auto;
-    }
-
-    .true {
-      background-color: #5d93ff;
-    }
-
-    .false {
-      background-color: #666;
-    }
-
-    .name,
-    .time {
-      margin-top: 10px;
-    }
-  }
-
-  .title {
-    font-size: 16px;
-    padding: 0;
-    margin: 0 0 6px;
-    white-space: nowrap;
-  }
-}
-</style>
-

diff --git a/public/config/customApproval.json b/public/config/customApproval.json
index d69296d..4c98ad2 100644
--- a/public/config/customApproval.json
+++ b/public/config/customApproval.json
@@ -17,6 +17,9 @@
     "softwareReviewReport": "技术负责人",
 
     "resistance--Describe": "实验室接地电阻记录",
-    "resistance": "审核人"
+    "resistance": "审核人",
+
+    "fileApproval--Describe": "文件审批",
+    "fileApproval": "主任"
   }
 }
diff --git a/src/components.d.ts b/src/components.d.ts
index b920dff..25665e9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -32,7 +32,6 @@
     CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
     CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/Approval/ApprovalDialog copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/components/Approval/ApprovalDialogCustom.vue b/src/components/Approval/ApprovalDialogCustom.vue
index a42e94e..6a2a591 100644
--- a/src/components/Approval/ApprovalDialogCustom.vue
+++ b/src/components/Approval/ApprovalDialogCustom.vue
@@ -23,6 +23,10 @@
     type: String,
     required: true,
   },
+  approvalModule: { // 审批的菜单模块
+    type: String,
+    default: '',
+  },
 })
 const emit = defineEmits(['onSuccess', 'refuse'])
 // 弹窗显示状态
@@ -167,7 +171,7 @@
     <el-dialog
       v-model="dialogVisible"
       title="审批操作"
-      width="600"
+      width="700"
       :before-close="handleClose"
     >
       <el-form
@@ -215,6 +219,10 @@
                   <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.deptName }}</span>
                 </el-option>
               </el-select>
+              <div v-if="props.approvalModule === 'fileApproval'" style="color: red;font-size: 11px;">
+                <span v-if="isShowUser">***注意：《作业指导书》请选择专业组长审核；程序文件、质量手册等选择质量负责人审核***</span>
+                <span v-if="!isShowUser">***注意：《作业指导书》请选择技术负责人；程序文件、质量手册等选择主任审核***</span>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/subpackage/inform/components/detailReport.vue b/src/views/business/subpackage/inform/components/detailReport.vue
index 9d0140a..b0e130b 100644
--- a/src/views/business/subpackage/inform/components/detailReport.vue
+++ b/src/views/business/subpackage/inform/components/detailReport.vue
@@ -141,12 +141,12 @@
   <app-container>
     <detail-page v-loading="loading" :title="title">
       <template #btns>
-        <el-button type="primary" @click="handleClick('agree')">
-          同意（测试专用，后续隐藏）
+        <!-- <el-button type="primary" @click="handleClick('agree')">
+          同意（模拟受检操作，提供测试使用，之后删除）
         </el-button>
         <el-button type="danger" @click="handleClick('refuse')">
-          拒绝（测试专用，后续隐藏）
-        </el-button>
+          拒绝（模拟受检操作，提供测试使用，之后删除）
+        </el-button> -->
         <el-button v-if="props.needSend" type="primary" @click="sendToCustomer">
           发送给受检单位
         </el-button>
diff --git a/src/views/resource/customer/contract/detail.vue b/src/views/resource/customer/contract/detail.vue
index 3687c36..8e7bb46 100644
--- a/src/views/resource/customer/contract/detail.vue
+++ b/src/views/resource/customer/contract/detail.vue
@@ -124,12 +124,12 @@
     <app-container>
       <detail-page v-loading="loading" title="合同执行变更登记表">
         <template #btns>
-          <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
+          <!-- <el-button v-if="fromPage !== 'equipment'" type="success" @click="handleCustomer('agree')">
             同意（模拟受检操作，提供测试使用，之后删除）
           </el-button>
           <el-button v-if="fromPage !== 'equipment'" type="danger" @click="handleCustomer('refuse')">
             拒绝（模拟受检操作，提供测试使用，之后删除）
-          </el-button>
+          </el-button> -->
           <el-button v-if="fromPage !== 'equipment'" type="primary" @click="sendToCustomer">
             发送给委托方
           </el-button>
diff --git a/src/views/resource/environment/resistance/edit.vue b/src/views/resource/environment/resistance/edit.vue
index fd06d64..84fdb02 100644
--- a/src/views/resource/environment/resistance/edit.vue
+++ b/src/views/resource/environment/resistance/edit.vue
@@ -2,7 +2,7 @@
 <script name="EnvironmentResistanceDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IResistanceRecord } from './resistance-interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -57,6 +57,8 @@
   taskId: '',
   testUseEquipment: '', //	测试所用设备
   testUseEquipmentId: '', //		测试所用设备id
+  model: '', // 规格型号
+  manufactureNo: '', // 出厂编号
   labCode: '', // 实验室
   labCodeName: '', // 实验室名称
   groupCode: '', // 部门
@@ -444,6 +446,8 @@
   if (list && list.length) {
     recordForm.value.testUseEquipment = list[0].equipmentName //	测试所用设备
     recordForm.value.testUseEquipmentId = list[0].id //		测试所用设备id
+    recordForm.value.model = list[0].model //		规格型号
+    recordForm.value.manufactureNo = list[0].manufactureNo //		出厂编号
   }
 }
 
@@ -661,6 +665,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="规格型号">
+              <el-input v-model="recordForm.model" :placeholder="type === 'detail' ? ' ' : '规格型号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号">
+              <el-input v-model="recordForm.manufactureNo" :placeholder="type === 'detail' ? ' ' : '出厂编号'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="测试依据" prop="testBasis">
               <el-input v-model="recordForm.testBasis" :placeholder="type === 'detail' ? ' ' : '请输入测试依据'" :disabled="type === 'detail'" />
             </el-form-item>
@@ -679,7 +693,7 @@
 
           <el-col :span="12">
             <el-form-item label="结论" prop="conclusion">
-              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入备注'" type="textarea" autosize :disabled="type === 'detail'" />
+              <el-input v-model="recordForm.conclusion" :placeholder="type === 'detail' ? ' ' : '请输入结论'" type="textarea" autosize :disabled="type === 'detail'" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index 439b574..cf4faae 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -53,15 +53,17 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '实验室', value: 'labCodeName', align: 'center' },
-  { text: '部门', value: 'groupCodeName', align: 'center' },
-  { text: '测试时间', value: 'testTime', align: 'center', width: '160' },
-  { text: '测试地点', value: 'testLocation', align: 'center', width: '240' },
-  { text: '测试所用设备', value: 'testUseEquipment', align: 'center', width: '200' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '测试时间', value: 'testTime', align: 'center', width: '120' },
+  { text: '测试地点', value: 'testLocation', align: 'center' },
+  { text: '测试所用设备', value: 'testUseEquipment', align: 'center' },
+  { text: '规格型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '测试依据', value: 'testBasis', align: 'center' },
-  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center', width: '140' },
-  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center', width: '160' },
-  { text: '结论', value: 'conclusion', align: 'center', width: '160' },
+  { text: '接地电阻指标(Ω)', value: 'resistanceIndex', align: 'center' },
+  { text: '接地电阻测试值(Ω)', value: 'resistanceTestValue', align: 'center' },
+  { text: '结论', value: 'conclusion', align: 'center' },
   { text: '测试人', value: 'createUserName', align: 'center', width: '120' },
   { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
diff --git a/src/views/resource/environment/resistance/resistance-interface.ts b/src/views/resource/environment/resistance/resistance-interface.ts
index 257868c..a7f75f8 100644
--- a/src/views/resource/environment/resistance/resistance-interface.ts
+++ b/src/views/resource/environment/resistance/resistance-interface.ts
@@ -33,6 +33,8 @@
   decisionItem?: number
   testUseEquipment: string //	测试所用设备
   testUseEquipmentId: string //		测试所用设备id
+  model: string // 规格型号
+  manufactureNo: string // 出厂编号
   labCode: string // 实验室
   labCodeName: string // 实验室名称
   groupCode: string // 部门
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 6f43b58..1c9ff9a 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -9,7 +9,9 @@
 import FilterFileTemplate from '@/views/resource/common/filterFileTemplate.vue'
 import { getDictByCode } from '@/api/system/dict'
 // import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
+import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -218,25 +220,35 @@
 }
 
 // ----------------------------------------------提交--------------------------------------------
-// 提交
-/**
- *
- * @param processId 流程实例id
- * @param id
- */
-const submitForm = () => {
+const selectApproverRef = ref() // 审批人自选组件ref
+// 选好审批人
+const confirmSelectApprover = async (approverList: string[] = []) => {
+  if (!approverList.length) {
+    ElMessage.warning('无审批人，无法提交！')
+    return false
+  }
   const loading = ElLoading.service({
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
   })
-  submitApprovalForm({ id: id.value, formId: flowFormId, processId: processId.value }).then((res) => {
+  const params = {
+    id: id.value,
+    formId: flowFormId,
+    processId: processId.value,
+    assignees: approverList,
+  }
+  submitApprovalForm(params).then((res) => {
     ElMessage.success('已提交')
     type.value = 'detail'
     detailById(id.value)
     loading.close()
   })
 }
+// 提交按钮
+const submitForm = () => {
+  selectApproverRef.value.initDialog()
+}
 // -------------------------------------------审批----------------------------------------
 
 // 审批结束回调
@@ -272,7 +284,7 @@
       })
   }
   else if (val === '同意') {
-    approvalDialog.value.initDialog('agree', taskId.value)
+    approvalDialog.value.initDialog('agree', taskId.value, id.value, processId.value)
   }
   else if (val === '拒绝') {
     approvalDialog.value.initDialog('refuse', taskId.value, id.value)
@@ -566,7 +578,11 @@
     </detail-block>
 
     <!-- 审批弹窗 -->
-    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" @refuse="refuse" /> -->
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" approval-module="fileApproval" :last-name="customApproval.approvalLastName.fileApproval" @on-success="approvalSuccess" @refuse="refuse" />
+    <!-- 选择审批人弹窗 -->
+    <select-approver-dialog ref="selectApproverRef" @confirm="confirmSelectApprover" />
 
     <!-- 审批详情 -->
     <template v-if="current === 'approval-form-approval'">
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index 41f9034..df77b2c 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type { IFileApprovalForm, IListQuery } from './approval-interface'
-import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -12,7 +12,8 @@
 import type { deptType } from '@/global'
 import { getFileChangeFormList } from '@/api/resource/fileChange'
 import useBridgeCount from '@/components/buttonBox/useBridgeCount'
-
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
+import customApproval from '/public/config/customApproval.json'
 // 定义常量
 const buttonBoxActive = 'fileApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 const flowFormId = 'zyglwjsp' // 资源管理 - 文件审批
@@ -267,17 +268,16 @@
 
 // 流程审批-同意
 const approvalAgreeHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+  apprDial.value.initDialog('agree', row.taskId, row.id, row.processId)
 }
 
 // 流程审批-拒绝
 const approvalRefuseHandler = (row: IFileApprovalForm) => {
-  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+  apprDial.value.initDialog('refuse', row.taskId, row.id)
 }
 
 // 取消（撤回审批单）
 const revokeApprById = (row: IFileApprovalForm) => {
-  // apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
   const params = {
     processInstanceId: row.processId!,
     comments: '',
@@ -308,24 +308,13 @@
   fetchData(true)
 }
 
-// 取消
-const approvalFormRevokeHandler = (param: any) => {
-  cancelApproval(param).then((res) => {
-    if (res.code === 200) {
-      ElMessage.success('已取消')
-    }
-    else {
-      ElMessage.error(`取消失败：${res.message}`)
-    }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
-    fetchData(true)
-  })
-}
-
 // 拒绝
-const approvalFormRefuseHandler = (param: any) => {
+const approvalFormRefuseHandler = (comments: string, taskId: string, id: string) => {
+  const param = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
   refuseApproval(param).then((res) => {
     if (res.code === 200) {
       ElMessage.success('已拒绝')
@@ -333,9 +322,6 @@
     else {
       ElMessage.error(`拒绝失败：${res.message}`)
     }
-    // 关闭弹窗
-    apprDial.value.handleClose()
-
     fetchData(true)
   })
 }
@@ -590,11 +576,19 @@
     </table-container>
 
     <!-- 审批单弹窗 -->
-    <approval-dialog
+    <!-- <approval-dialog
       ref="apprDial"
       @on-success="afterApprovalHandler"
       @on-refuse="approvalFormRefuseHandler"
-      @on-revoke="approvalFormRevokeHandler"
+    /> -->
+
+    <!-- 审批弹窗-审批人自选 -->
+    <approval-dialog
+      ref="apprDial"
+      :last-name="customApproval.approvalLastName.fileApproval"
+      approval-module="fileApproval"
+      @on-success="afterApprovalHandler"
+      @refuse="approvalFormRefuseHandler"
     />
 
     <!-- 右上角按钮集合 -->
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index a0c7c5d..3a859ac 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -5,7 +5,7 @@
 import FileSelectDialog from './dialog/selectSysFileDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
diff --git a/src/views/resource/file/methodConfirm/detail.vue b/src/views/resource/file/methodConfirm/detail.vue
index 949e446..8e22099 100644
--- a/src/views/resource/file/methodConfirm/detail.vue
+++ b/src/views/resource/file/methodConfirm/detail.vue
@@ -8,7 +8,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IFileInfo as IMethodFileInfo } from '@/views/resource/technology/method/method-interface'
 import { getFileMethodList } from '@/api/resource/fileTechnology'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
@@ -863,7 +863,7 @@
             </el-col>
           </el-row>
 
-          <el-row :gutter="24">
+          <!-- <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="评审组成员" prop="reviewTeam">
                 <el-input v-model="methodConfirm.reviewTeam" placeholder="请选择评审组成员" :clearable="true" disabled>
@@ -875,7 +875,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
 
           <!-- <el-row :gutter="24">
             <el-col :span="24">
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index 738a05c..7a2bb72 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -3,7 +3,7 @@
 import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRevisionApply } from '../revision/software-revision'
 import type { IReviewReport, IReviewStaff } from './software-review'
-// import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialogCustom.vue'
 import selectApproverDialog from '@/components/ApprovalCustom/selectApproverDialog.vue'
 import customApproval from '/public/config/customApproval.json'
 import FilterRegistedStaff from '@/views/resource/common/filterRegistedStaff.vue'
diff --git a/src/views/workbench/components/buttonSet.vue b/src/views/workbench/components/buttonSet.vue
index d3c1a6c..7f77348 100644
--- a/src/views/workbench/components/buttonSet.vue
+++ b/src/views/workbench/components/buttonSet.vue
@@ -1,6 +1,12 @@
 <!-- 按钮集合 -->
 <script lang="ts" setup name="ButtonSet">
 import { ElMessage } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+
+const user = useUserStore() // 用户信息
+const showEmpty = ref(false)
+const emptyDisc = ref('') // 描述文字
+const isAdministrator = ref('0') // 是不是超级管理员
 const $router = useRouter()
 const buttons = [
   {
@@ -68,10 +74,24 @@
 const changePage = (path: string) => {
   $router.push(path)
 }
+
+onMounted(() => {
+  isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '0' && !user.bizLabCode) { // 不是超级管理员、没有实验室
+    emptyDisc.value = '此用户非超级管理员且无实验室，无权限查看'
+    showEmpty.value = true
+  }
+  if (isAdministrator.value === '0' && user.bizLabCode && !user.groupNo) { // 有实验室但没有组
+    emptyDisc.value = '此用户非超级管理员且无部门，无权限查看'
+    showEmpty.value = true
+  }
+})
 </script>
 
 <template>
-  <div style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
+  <el-empty v-show="showEmpty" style="height: 100%;" :image-size="50" :description="emptyDisc" />
+  <div v-show="!showEmpty" style="display: flex;gap: 10px;flex-wrap: wrap;justify-content: space-around;">
     <div v-for="item in buttons" :key="item.id" style="flex: 0 0 25%;" class="buttonSet-button" :style="`background: ${item.color}`" @click="changePage(item.path)">
       {{ item.name }}
     </div>
diff --git a/src/views/workbench/components/checkManage.vue b/src/views/workbench/components/checkManage.vue
index 29e56b9..0102188 100644
--- a/src/views/workbench/components/checkManage.vue
+++ b/src/views/workbench/components/checkManage.vue
@@ -43,14 +43,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -67,8 +67,8 @@
 const fetchCheckData = () => {
   getCheckData({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -104,8 +104,8 @@
     standardEquipmentName: '', // 被核查标准装置名称
     equipmentManufactureNo: '', // 被核查设备出厂编号
     recordNo: '', // 核查记录
-    labCode: labCode.value, // 实验室
-    groupCode: groupCode.value, // 部门
+    labCode: labCode.value === 'A' ? null : labCode.value, // 实验室
+    groupCode: groupCode.value === 'A' ? null : groupCode.value, // 部门
     limit: 999999,
     offset: 1,
   }).then((response) => {
@@ -133,8 +133,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -151,7 +151,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -169,11 +169,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/eqptManage.vue b/src/views/workbench/components/eqptManage.vue
index dadc6db..76eb233 100644
--- a/src/views/workbench/components/eqptManage.vue
+++ b/src/views/workbench/components/eqptManage.vue
@@ -72,14 +72,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -110,8 +110,8 @@
  */
 function fetchDistributedData(type: 'distributed' | 'overdue') {
   listQueryDistributed.value.sampleStatus = type === 'distributed' ? '2' : '8'
-  listQueryDistributed.value.labCode = labCode.value
-  listQueryDistributed.value.groupCode = groupCode.value
+  listQueryDistributed.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryDistributed.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getTaskList(listQueryDistributed.value).then((response) => {
     const tempList = response.data.rows.map((item: { realDeliverTime: string; requireOverTime: string }) => {
@@ -165,8 +165,8 @@
 // 数据查询
 function fetchMeasureData() {
   listQueryMeasure.value.glStaff = user.groupNo === 'GL' ? '1' : '0'
-  listQueryMeasure.value.labCode = labCode.value
-  listQueryMeasure.value.groupCode = groupCode.value
+  listQueryMeasure.value.labCode = labCode.value === 'A' ? null : labCode.value as any
+  listQueryMeasure.value.groupCode = groupCode.value === 'A' ? null : groupCode.value
   loading.value = true
   getDeptMeasureList(listQueryMeasure.value).then((res) => {
     measureList.value = res.data.rows.map((item: any) => {
@@ -226,8 +226,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     controlMenu()
     fetchData()
   }
@@ -245,7 +245,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -264,11 +264,11 @@
   <el-empty v-show="showEmpty" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/equipmentManage.vue b/src/views/workbench/components/equipmentManage.vue
index 8dd70c8..366b5e0 100644
--- a/src/views/workbench/components/equipmentManage.vue
+++ b/src/views/workbench/components/equipmentManage.vue
@@ -58,14 +58,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -76,8 +76,8 @@
 const fetchEquipmentStatus = () => {
   getEquipmentStatus({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -95,8 +95,8 @@
 const fetchEquipmentType = () => {
   getEquipmentType({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -115,8 +115,8 @@
 const fetchEquipmentTrace = () => {
   getEquipmentTrace({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -132,8 +132,8 @@
 const fetchExpireTrend = () => {
   getExpireTrend({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -164,8 +164,8 @@
 const fetchEquipmentCount = () => {
   getEquipmentCount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data) {
@@ -196,8 +196,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认全站
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -214,7 +214,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -232,11 +232,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-equipment-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 筛选框和设备总数 -->
diff --git a/src/views/workbench/components/measureManage.vue b/src/views/workbench/components/measureManage.vue
index fa17ce3..9fdf0cc 100644
--- a/src/views/workbench/components/measureManage.vue
+++ b/src/views/workbench/components/measureManage.vue
@@ -44,14 +44,14 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: null,
+      value: 'A',
     })
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -62,8 +62,8 @@
   // 设备类型分析
   getMeasureDevice({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -86,8 +86,8 @@
 const fetchMeasureConclusion = (startDate = '', endDate = '') => {
   getMeasureConclusion({
     endDate,	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate,	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -109,8 +109,8 @@
 const fetchertAmount = () => {
   getCertAmount({
     endDate: '',	// 结束日期（检校设备分析/检校结果分析查询条件）
-    groupCode: groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
-    labCode: labCode.value,	//	实验室编号
+    groupCode: groupCode.value === 'A' ? null : groupCode.value,	//	部门编号（当是管理组人员时，为下拉选择的部门）
+    labCode: labCode.value === 'A' ? null : labCode.value,	//	实验室编号
     startDate: '',	//	起始日期（检校设备分析/检校结果分析查询条件）
   }).then((res) => {
     if (res.data && res.data.length) {
@@ -160,8 +160,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
     fetchData()
   }
   else { // 不是超级管理员
@@ -178,7 +178,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -196,11 +196,11 @@
   <el-empty v-show="showEmpty" style="height: 100%;" :description="emptyDisc" />
   <div v-show="!showEmpty" class="workBench-measure-manage">
     <!-- 超级管理员才可以筛选实验室 -->
-    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" clearable @change="changeSelect">
+    <el-select v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;position: absolute; top: 5px;right: 150px;" class="short-input" placeholder="实验室" @change="changeSelect">
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 综合管理组才可以筛选部门 -->
-    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" clearable @change="changeSelect">
+    <el-select v-model="groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;position: absolute; top: 5px;right: 10px;" class="short-input" placeholder="部门" @change="changeSelect">
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <div v-loading="loading" style="display: flex;flex-direction: column;width: 100%;height: 100%;">
diff --git a/src/views/workbench/components/noveltySearch.vue b/src/views/workbench/components/noveltySearch.vue
index b1d8821..cee7e45 100644
--- a/src/views/workbench/components/noveltySearch.vue
+++ b/src/views/workbench/components/noveltySearch.vue
@@ -16,10 +16,15 @@
   labCode: '',
 })
 const show = ref('')
-// 获取数据
+// 获取数据-查新记录表
 const fetchData = () => {
   loading.value = true
-  showBenchNovelty(query.value).then((res) => {
+  const params = {
+    fileId: query.value.fileId,
+    groupCode: query.value.groupCode === 'A' ? null : query.value.groupCode,
+    labCode: query.value.labCode === 'A' ? null : query.value.labCode,
+  }
+  showBenchNovelty(params).then((res) => {
     methodList.value = res.data.rows
     if (methodList.value.length) {
       show.value = methodList.value[0].id
@@ -34,9 +39,33 @@
 }
 onMounted(() => {
   // 判断是否超级管理员
+  // isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
+  // if (isAdministrator.value === '0') { // 不是
+  //   query.value.labCode = user.bizLabCode
+  // }
+  // else { // 是
+  //   query.value.labCode = 'A'
+  // }
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
-  if (isAdministrator.value === '0') {
-    query.value.labCode = user.bizLabCode
+  console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
+  if (isAdministrator.value === '1') { // 超级管理员
+    query.value.labCode = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    query.value.groupCode = 'A' // 超级管理员默认查看全部
+  }
+  else { // 不是超级管理员
+    if (user.bizLabCode && user.groupNo) { // 没有实验室
+      if (user.groupNo === 'GL') { // 综合管理组
+        query.value.labCode = user.bizLabCode // 实验室
+        // 综合管理组默认查实验室下面的所有数据，不筛选部门
+        query.value.groupCode = 'A'
+        // 综合管理组可以查看待分发
+      }
+      else { // 其他组
+        query.value.labCode = user.bizLabCode // 实验室
+        // 其他组默认筛选自己组
+        query.value.groupCode = user.groupNo
+      }
+    }
   }
   fetchData()
 })
@@ -55,18 +84,18 @@
       }
     })
     groupCodeList.value.unshift({
-      id: 'all',
+      id: 'A',
       name: '全部',
-      value: '',
+      value: 'A',
     })
   })
   // 实验室
   getDictByCode('bizGroupCodeEquipment').then((response) => {
     labCodeList.value = response.data
     labCodeList.value.unshift({
-      id: 'all',
-      name: '全部',
-      value: '',
+      id: 'A',
+      name: '全站',
+      value: 'A',
     })
   })
 }
@@ -107,21 +136,21 @@
 </script>
 
 <template>
-  <div style="display: flex;align-items: center;">
+  <div v-show="!showEmpty" style="display: flex;align-items: center;">
     <div class="title" style="margin-right: 10px;">
       测试校准检定方法查新进度
     </div>
     <!-- 实验室下拉框 -->
     <el-select
-      v-if="isAdministrator === '1'" v-model="query.labCode" style="width: 130px;" class="short-input"
-      placeholder="实验室" clearable @change="fetchData"
+      v-model="query.labCode" :disabled="isAdministrator === '0'" style="width: 130px;" class="short-input"
+      placeholder="实验室" @change="fetchData"
     >
       <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
     <!-- 部门 -->
     <el-select
-      v-model="query.groupCode" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
-      clearable @change="fetchData"
+      v-model="query.groupCode" :disabled="isAdministrator === '0' && user.groupNo !== 'GL'" style="width: 130px;margin-left: 10px;" class="short-input" placeholder="部门"
+      @change="fetchData"
     >
       <el-option v-for="item in groupCodeList" :key="item.id" :label="item.name" :value="item.value" />
     </el-select>
diff --git a/src/views/workbench/components/progressBar.vue b/src/views/workbench/components/progressBar.vue
deleted file mode 100644
index 561910f..0000000
--- a/src/views/workbench/components/progressBar.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<!-- 进度 -->
-<script lang="ts" setup name="ProgressBar">
-import { ElMessage } from 'element-plus'
-import { detailQualityRegistration } from '@/api/quality/internal/registration'
-const $router = useRouter()
-// 内部审核进度
-const scheduleList = ref([
-  {
-    stageType: '1',
-    stageTypeName: '内审组建立',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '2',
-    stageTypeName: '内部审核计划公示',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '3',
-    stageTypeName: '《内部审核检查表》编制',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '4',
-    stageTypeName: '首次会议',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-    scheduleFileList: [] as any[],
-  },
-  {
-    stageType: '5',
-    stageTypeName: '现场审核',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '1', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '6',
-    stageTypeName: '内审组内部会议',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-    scheduleFileList: [] as any[],
-  },
-  {
-    stageType: '7',
-    stageTypeName: '交换意见',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '8',
-    stageTypeName: '末次会议',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-    scheduleFileList: [] as any[],
-  },
-  {
-    stageType: '9',
-    stageTypeName: '措施制定',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '10',
-    stageTypeName: '措施实施',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '11',
-    stageTypeName: '效果验证',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-  {
-    stageType: '12',
-    stageTypeName: '记录存档',
-    scheduleTime: '2020.11.05',
-    remarks: '',
-    isCompleted: '0', // 是否完成(0 未完成 1 完成)
-    scheduleUserList: [] as any[],
-  },
-]) as any
-</script>
-
-<template>
-  <div class="workbench-content-pro-container">
-    <div v-for="(item) in scheduleList" :key="item.stageTypeName" class="content-pro">
-      <div class="circle" :class="item.isCompleted === '1' ? 'true' : 'false'" />
-      <div class="name">
-        {{ item.stageTypeName }}
-      </div>
-      <div class="time">
-        {{ item.scheduleTime }}
-      </div>
-    </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.workbench-content-pro-container {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  margin-top: 15px;
-  position: relative;
-
-  &::after {
-    display: block;
-    content: "";
-    width: 90%;
-    height: 3px;
-    background-color: #5d93ff;
-    position: absolute;
-    top: 6px;
-    z-index: 1;
-    padding: 0 15px;
-    left: 50%;
-    transform: translateX(-50%);
-  }
-
-  .content-pro {
-    text-align: center;
-    position: relative;
-    z-index: 2;
-
-    .circle {
-      width: 15px;
-      height: 15px;
-      border-radius: 50%;
-      margin: 0 auto;
-    }
-
-    .true {
-      background-color: #5d93ff;
-    }
-
-    .false {
-      background-color: #666;
-    }
-
-    .name,
-    .time {
-      margin-top: 10px;
-    }
-  }
-
-  .title {
-    font-size: 16px;
-    padding: 0;
-    margin: 0 0 6px;
-    white-space: nowrap;
-  }
-}
-</style>
-
diff --git a/src/views/workbench/components/step.vue b/src/views/workbench/components/step.vue
index 45a0c54..13b8348 100644
--- a/src/views/workbench/components/step.vue
+++ b/src/views/workbench/components/step.vue
@@ -9,17 +9,15 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useUserStore from '@/store/modules/user'
 
-const $router = useRouter()
 const user = useUserStore() // 用户信息
 const loading = ref(false)
-const showEmpty = ref(false)
 const labCode = ref('') // 实验室
 const groupCode = ref('') as any // 部门
 const isAdministrator = ref('0') // 是不是超级管理员
+const showEmpty = ref(false)
 const emptyDisc = ref('') // 描述文字
-// 内部审核进度
-const scheduleList = ref([]) as any
-
+const scheduleList = ref([]) as any // 内部审核进度
+const showTab = ref('内部审核进度')
 // ------------------------------------------字典----------------------------------------------
 const groupCodeList = ref([]) as any // 部门
 const labCodeList = ref<dictType[]>([]) // 实验室
@@ -46,7 +44,7 @@
   })
 
   // 实验室
-  getDictByCode('bizGroupCodeEquipment').then((response) => {
+  getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
   })
 }
@@ -69,7 +67,11 @@
 
 // 内部审核登记表
 function fetchRegistrationList() {
-  getRegistrationList({ ...listQuery.value, bizLabCode: labCode.value, formId: SCHEDULE.INTERNAL_AUDIT_WORK_REGITRATION_APPROVAL }).then((response) => {
+  getRegistrationList({
+    ...listQuery.value,
+    bizLabCode: labCode.value === 'A' ? null : labCode.value,
+    formId: SCHEDULE.INTERNAL_AUDIT_WORK_REGITRATION_APPROVAL,
+  }).then((response) => {
     const tempList = response.data.rows.filter((item: { isShow: number }) => item.isShow === 1) || [] // isShow === 1 标识这个登记表勾选了展示在工作台
     if (tempList && tempList.length) {
       scheduleList.value = [
@@ -149,6 +151,9 @@
         },
       ]
     }
+    else {
+      scheduleList.value = []
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -162,7 +167,7 @@
 
 // 改变实验室\部门
 const changeSelect = () => {
-  if (!showEmpty.value && (isAdministrator.value === '1' || (user.bizLabCode && user.groupNo))) {
+  if (!showEmpty.value && (isAdministrator.value === '1' || user.bizLabCode)) {
     fetchData()
   }
 }
@@ -170,9 +175,8 @@
   isAdministrator.value = user.roleTips.includes('administrator') ? '1' : '0' // 是否是超级管理员
   console.log('是否是超级管理员', user.roleTips, isAdministrator.value)
   if (isAdministrator.value === '1') { // 超级管理员
-    labCode.value = user.bizLabCode || 'H' // 有实验室就默认本人实验室，没有实验室就默认海口
-    groupCode.value = null // 超级管理员默认查看全部
-    fetchData()
+    labCode.value = user.bizLabCode || 'A' // 有实验室就默认本人实验室，没有实验室就默认海口
+    groupCode.value = 'A' // 超级管理员默认查看全部
   }
   else { // 不是超级管理员
     if (!user.bizLabCode) { // 没有实验室
@@ -188,7 +192,7 @@
       if (user.groupNo === 'GL') { // 综合管理组
         labCode.value = user.bizLabCode // 实验室
         // 综合管理组默认查实验室下面的所有数据，不筛选部门
-        groupCode.value = ''
+        groupCode.value = 'A'
         // 综合管理组可以查看待分发
       }
       else { // 其他组
@@ -196,15 +200,15 @@
         // 其他组默认筛选自己组
         groupCode.value = user.groupNo
       }
-      fetchData()
     }
   }
+  fetchData()
 })
-const showTab = ref('内部审核进度')
 </script>
 
 <template>
-  <div v-loading="loading" class="workBench-step">
+  <el-empty v-show="showEmpty" style="height: 100%;" :image-size="50" :description="emptyDisc" />
+  <div v-show="!showEmpty" v-loading="loading" class="workBench-step">
     <!-- 切换按钮 内部审核进度/测试校准检定方法查新进度  -->
     <div class="show-tab">
       <el-radio-group v-model="showTab" size="small">
@@ -221,7 +225,7 @@
         <!-- 超级管理员才可以筛选实验室 -->
         <el-select
           v-model="labCode" :disabled="isAdministrator === '0'" style="width: 130px;" class="short-input"
-          placeholder="实验室" clearable @change="changeSelect"
+          placeholder="实验室" @change="changeSelect"
         >
           <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>