diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index cf6e3ce..f5dba31 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -33,6 +33,7 @@
   { text: '记录表名称', value: 'logName', align: 'center' },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' },
   { text: '验收人', value: 'createUserName', align: 'center' },

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index cf6e3ce..f5dba31 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -33,6 +33,7 @@
   { text: '记录表名称', value: 'logName', align: 'center' },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' },
   { text: '验收人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index b693cc2..4b77d5e 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -54,7 +54,7 @@
 // 校验规则
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   // groupCode: [{ required: true, message: '组别代码不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
@@ -200,7 +200,7 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
+            <el-form-item label="实验室" prop="labCode">
               <el-select v-model="form.labCode" :placeholder="pageType === 'detail' ? ' ' : '请选择实验室代码'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index cf6e3ce..f5dba31 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -33,6 +33,7 @@
   { text: '记录表名称', value: 'logName', align: 'center' },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' },
   { text: '验收人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index b693cc2..4b77d5e 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -54,7 +54,7 @@
 // 校验规则
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   // groupCode: [{ required: true, message: '组别代码不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
@@ -200,7 +200,7 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
+            <el-form-item label="实验室" prop="labCode">
               <el-select v-model="form.labCode" :placeholder="pageType === 'detail' ? ' ' : '请选择实验室代码'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 2a23572..189269d 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -20,7 +20,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import { getStaffList } from '@/api/resource/register'
-import { addStandard, failUpdateStandard, getInfo, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
+import { addStandard, failUpdateStandard, getInfo, getStandardCertList, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
 import selectStaffPerson from '@/views/equipement/standard/book/dialog/selectPerson.vue'
 import { getUid } from '@/utils/getUid'
 import { getDeptIdByLabAndGroup } from '@/api/equipment/info/book'
@@ -64,6 +64,7 @@
   // buildStandardDate: '', // 建标日期
   standardCertNo: '', // 计量标准证书号
   lastReviewDate: '', // 最近复查日期
+  nextReviewDate: '', // 下次复查日期
   deptId: '', // 标准所在部门id
   deptName: '', // 标准所在部门名称
   directorId: '', // 标准负责人id
@@ -107,7 +108,7 @@
   labCodeName: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   majorType: [{ required: true, message: '专业类别不能为空', trigger: ['blur', 'change'] }],
   standardAlias: [{ required: true, message: '标准装置别名不能为空', trigger: ['blur', 'change'] }],
-  nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
+  // nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
   buildStandardReportPdfFile: [{ required: true, message: '建标报告（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   examTablePdfFile: [{ required: true, message: '考核表（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   createTime: [{ required: true, message: '创建时间不能为空', trigger: ['blur', 'change'] }],
@@ -258,6 +259,7 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         form.value[prop] = res.data[0]
+        event.target.value = null
         // 重置当前验证
         ElMessage.success(message)
         loading.close()
@@ -266,6 +268,8 @@
         ElMessage.error(res.message)
         loading.close()
       }
+    }).catch(() => {
+      event.target.value = null
     })
   }
 }
@@ -482,6 +486,25 @@
   }
 }
 // -------------------------------------------获取详情信息----------------------------------------
+// 获取最新一条标准证书
+const fetchLastStandardCert = (standardId: string) => {
+  if (!standardId) {
+    return
+  }
+  const params = {
+    id: standardId,
+    offset: 1,
+    limit: 20,
+  }
+  getStandardCertList(params).then((res) => {
+    if (res && res.data && res.data.rows && res.data.rows.length) {
+      const tempCert = res.data.rows[res.data.rows.length - 1]
+      form.value.lastReviewDate = tempCert.certificateDate // 最近复查日期-证书日期
+      form.value.nextReviewDate = tempCert.certificateExpireDate // 下次复查日期-证书有效期
+    }
+  })
+}
+
 /**
  * 获取详情
  * @param isCopy 是否备份，判断基本信息是否变化
@@ -530,6 +553,8 @@
       }
     }
     checkHasChanged()
+    // 如果有标准证书，最近复查日期和下次复查日期就需要用标准证书的证书日期和证书有效期
+    fetchLastStandardCert(infoId.value)
     loading.close()
   })
 }
@@ -796,24 +821,28 @@
   }
 }
 
-// 最近复查日期变化
+// 最近复查日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeLastReviewDate = (val: Date) => {
-  if (val) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
-  else {
-    form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (val) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
+  // else {
+  //   form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
-// 创建日期变化
+
+// 创建日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeCreateTime = (val: string) => {
-  if (!form.value.lastReviewDate) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (!form.value.lastReviewDate) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
 
 // 检查信息变化去标红字段
 function checkHasChanged() {
+  if (props.approvalStatusName !== '待审批') {
+    return
+  }
   const params = {
     technologyRelationList: technologyRelationList.value.map((item) => {
       return {

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index cf6e3ce..f5dba31 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -33,6 +33,7 @@
   { text: '记录表名称', value: 'logName', align: 'center' },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' },
   { text: '验收人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index b693cc2..4b77d5e 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -54,7 +54,7 @@
 // 校验规则
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   // groupCode: [{ required: true, message: '组别代码不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
@@ -200,7 +200,7 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
+            <el-form-item label="实验室" prop="labCode">
               <el-select v-model="form.labCode" :placeholder="pageType === 'detail' ? ' ' : '请选择实验室代码'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 2a23572..189269d 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -20,7 +20,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import { getStaffList } from '@/api/resource/register'
-import { addStandard, failUpdateStandard, getInfo, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
+import { addStandard, failUpdateStandard, getInfo, getStandardCertList, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
 import selectStaffPerson from '@/views/equipement/standard/book/dialog/selectPerson.vue'
 import { getUid } from '@/utils/getUid'
 import { getDeptIdByLabAndGroup } from '@/api/equipment/info/book'
@@ -64,6 +64,7 @@
   // buildStandardDate: '', // 建标日期
   standardCertNo: '', // 计量标准证书号
   lastReviewDate: '', // 最近复查日期
+  nextReviewDate: '', // 下次复查日期
   deptId: '', // 标准所在部门id
   deptName: '', // 标准所在部门名称
   directorId: '', // 标准负责人id
@@ -107,7 +108,7 @@
   labCodeName: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   majorType: [{ required: true, message: '专业类别不能为空', trigger: ['blur', 'change'] }],
   standardAlias: [{ required: true, message: '标准装置别名不能为空', trigger: ['blur', 'change'] }],
-  nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
+  // nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
   buildStandardReportPdfFile: [{ required: true, message: '建标报告（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   examTablePdfFile: [{ required: true, message: '考核表（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   createTime: [{ required: true, message: '创建时间不能为空', trigger: ['blur', 'change'] }],
@@ -258,6 +259,7 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         form.value[prop] = res.data[0]
+        event.target.value = null
         // 重置当前验证
         ElMessage.success(message)
         loading.close()
@@ -266,6 +268,8 @@
         ElMessage.error(res.message)
         loading.close()
       }
+    }).catch(() => {
+      event.target.value = null
     })
   }
 }
@@ -482,6 +486,25 @@
   }
 }
 // -------------------------------------------获取详情信息----------------------------------------
+// 获取最新一条标准证书
+const fetchLastStandardCert = (standardId: string) => {
+  if (!standardId) {
+    return
+  }
+  const params = {
+    id: standardId,
+    offset: 1,
+    limit: 20,
+  }
+  getStandardCertList(params).then((res) => {
+    if (res && res.data && res.data.rows && res.data.rows.length) {
+      const tempCert = res.data.rows[res.data.rows.length - 1]
+      form.value.lastReviewDate = tempCert.certificateDate // 最近复查日期-证书日期
+      form.value.nextReviewDate = tempCert.certificateExpireDate // 下次复查日期-证书有效期
+    }
+  })
+}
+
 /**
  * 获取详情
  * @param isCopy 是否备份，判断基本信息是否变化
@@ -530,6 +553,8 @@
       }
     }
     checkHasChanged()
+    // 如果有标准证书，最近复查日期和下次复查日期就需要用标准证书的证书日期和证书有效期
+    fetchLastStandardCert(infoId.value)
     loading.close()
   })
 }
@@ -796,24 +821,28 @@
   }
 }
 
-// 最近复查日期变化
+// 最近复查日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeLastReviewDate = (val: Date) => {
-  if (val) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
-  else {
-    form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (val) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
+  // else {
+  //   form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
-// 创建日期变化
+
+// 创建日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeCreateTime = (val: string) => {
-  if (!form.value.lastReviewDate) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (!form.value.lastReviewDate) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
 
 // 检查信息变化去标红字段
 function checkHasChanged() {
+  if (props.approvalStatusName !== '待审批') {
+    return
+  }
   const params = {
     technologyRelationList: technologyRelationList.value.map((item) => {
       return {
diff --git a/src/views/equipement/standard/book/components/certificate.vue b/src/views/equipement/standard/book/components/certificate.vue
index d214962..6c043f5 100644
--- a/src/views/equipement/standard/book/components/certificate.vue
+++ b/src/views/equipement/standard/book/components/certificate.vue
@@ -1,4 +1,4 @@
-<!-- 标准装置台账信息详情 校准证书 -->
+<!-- 标准装置台账信息详情 标准证书 -->
 <script name="StandardBookCertificate" lang="ts" setup>
 import { onMounted, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
@@ -33,8 +33,8 @@
   { text: '证书编号', value: 'certificateNo', align: 'center', required: true, width: '160' },
   { text: '证书名称', value: 'certificateName', align: 'center', required: true },
   { text: '出具单位', value: 'provideCompany', align: 'center', required: true },
-  { text: '证书日期', value: 'certificateDate', align: 'center', width: '120', required: true },
-  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '120', required: true },
+  { text: '证书日期', value: 'certificateDate', align: 'center', width: '180', required: true },
+  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '180', required: true },
   { text: '附件', value: 'attachmentFile', align: 'center', required: true },
 ]
 
@@ -109,7 +109,7 @@
   if (!useCheckList(list.value, columns, '标准证书')) {
     return false
   }
-  const tempParams = list.value.filter(item => !item.id) // 找到这次新增的数据（没有id的）
+  const tempParams = list.value.filter(item => !item.id).reverse() // 找到这次新增的数据（没有id的）
   const params = tempParams.map((item) => {
     return {
       ...item,

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index cf6e3ce..f5dba31 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -33,6 +33,7 @@
   { text: '记录表名称', value: 'logName', align: 'center' },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' },
   { text: '验收人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index b693cc2..4b77d5e 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -54,7 +54,7 @@
 // 校验规则
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   // groupCode: [{ required: true, message: '组别代码不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
@@ -200,7 +200,7 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
+            <el-form-item label="实验室" prop="labCode">
               <el-select v-model="form.labCode" :placeholder="pageType === 'detail' ? ' ' : '请选择实验室代码'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 2a23572..189269d 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -20,7 +20,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import { getStaffList } from '@/api/resource/register'
-import { addStandard, failUpdateStandard, getInfo, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
+import { addStandard, failUpdateStandard, getInfo, getStandardCertList, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
 import selectStaffPerson from '@/views/equipement/standard/book/dialog/selectPerson.vue'
 import { getUid } from '@/utils/getUid'
 import { getDeptIdByLabAndGroup } from '@/api/equipment/info/book'
@@ -64,6 +64,7 @@
   // buildStandardDate: '', // 建标日期
   standardCertNo: '', // 计量标准证书号
   lastReviewDate: '', // 最近复查日期
+  nextReviewDate: '', // 下次复查日期
   deptId: '', // 标准所在部门id
   deptName: '', // 标准所在部门名称
   directorId: '', // 标准负责人id
@@ -107,7 +108,7 @@
   labCodeName: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   majorType: [{ required: true, message: '专业类别不能为空', trigger: ['blur', 'change'] }],
   standardAlias: [{ required: true, message: '标准装置别名不能为空', trigger: ['blur', 'change'] }],
-  nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
+  // nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
   buildStandardReportPdfFile: [{ required: true, message: '建标报告（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   examTablePdfFile: [{ required: true, message: '考核表（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   createTime: [{ required: true, message: '创建时间不能为空', trigger: ['blur', 'change'] }],
@@ -258,6 +259,7 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         form.value[prop] = res.data[0]
+        event.target.value = null
         // 重置当前验证
         ElMessage.success(message)
         loading.close()
@@ -266,6 +268,8 @@
         ElMessage.error(res.message)
         loading.close()
       }
+    }).catch(() => {
+      event.target.value = null
     })
   }
 }
@@ -482,6 +486,25 @@
   }
 }
 // -------------------------------------------获取详情信息----------------------------------------
+// 获取最新一条标准证书
+const fetchLastStandardCert = (standardId: string) => {
+  if (!standardId) {
+    return
+  }
+  const params = {
+    id: standardId,
+    offset: 1,
+    limit: 20,
+  }
+  getStandardCertList(params).then((res) => {
+    if (res && res.data && res.data.rows && res.data.rows.length) {
+      const tempCert = res.data.rows[res.data.rows.length - 1]
+      form.value.lastReviewDate = tempCert.certificateDate // 最近复查日期-证书日期
+      form.value.nextReviewDate = tempCert.certificateExpireDate // 下次复查日期-证书有效期
+    }
+  })
+}
+
 /**
  * 获取详情
  * @param isCopy 是否备份，判断基本信息是否变化
@@ -530,6 +553,8 @@
       }
     }
     checkHasChanged()
+    // 如果有标准证书，最近复查日期和下次复查日期就需要用标准证书的证书日期和证书有效期
+    fetchLastStandardCert(infoId.value)
     loading.close()
   })
 }
@@ -796,24 +821,28 @@
   }
 }
 
-// 最近复查日期变化
+// 最近复查日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeLastReviewDate = (val: Date) => {
-  if (val) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
-  else {
-    form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (val) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
+  // else {
+  //   form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
-// 创建日期变化
+
+// 创建日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeCreateTime = (val: string) => {
-  if (!form.value.lastReviewDate) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (!form.value.lastReviewDate) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
 
 // 检查信息变化去标红字段
 function checkHasChanged() {
+  if (props.approvalStatusName !== '待审批') {
+    return
+  }
   const params = {
     technologyRelationList: technologyRelationList.value.map((item) => {
       return {
diff --git a/src/views/equipement/standard/book/components/certificate.vue b/src/views/equipement/standard/book/components/certificate.vue
index d214962..6c043f5 100644
--- a/src/views/equipement/standard/book/components/certificate.vue
+++ b/src/views/equipement/standard/book/components/certificate.vue
@@ -1,4 +1,4 @@
-<!-- 标准装置台账信息详情 校准证书 -->
+<!-- 标准装置台账信息详情 标准证书 -->
 <script name="StandardBookCertificate" lang="ts" setup>
 import { onMounted, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
@@ -33,8 +33,8 @@
   { text: '证书编号', value: 'certificateNo', align: 'center', required: true, width: '160' },
   { text: '证书名称', value: 'certificateName', align: 'center', required: true },
   { text: '出具单位', value: 'provideCompany', align: 'center', required: true },
-  { text: '证书日期', value: 'certificateDate', align: 'center', width: '120', required: true },
-  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '120', required: true },
+  { text: '证书日期', value: 'certificateDate', align: 'center', width: '180', required: true },
+  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '180', required: true },
   { text: '附件', value: 'attachmentFile', align: 'center', required: true },
 ]
 
@@ -109,7 +109,7 @@
   if (!useCheckList(list.value, columns, '标准证书')) {
     return false
   }
-  const tempParams = list.value.filter(item => !item.id) // 找到这次新增的数据（没有id的）
+  const tempParams = list.value.filter(item => !item.id).reverse() // 找到这次新增的数据（没有id的）
   const params = tempParams.map((item) => {
     return {
       ...item,
diff --git a/src/views/equipement/stateMaintenance/commonComponents/basic.vue b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
index 983ed68..9d3e10e 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
@@ -162,7 +162,16 @@
 const selectEquipmentDialogRef = ref() // 选择设备编号组件ref
 // 批量添加
 const selectEquipment = () => {
-  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', '4')
+  // approvalType: // 1启封、2封存、3禁用、4报废
+  const tempMap = { // 设备使用状态 1在用，2，禁用 3，报废 4，封存，5，延用
+    1: '4', // 1启封
+    2: '1', // 2封存
+    3: '', // 禁用
+    4: '', // 报废
+  } as any
+  const filterType = tempMap[props.approvalType]
+  console.log('========', filterType, props.approvalType)
+  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', filterType)
 }
 
 // 确定选择设备

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index cf6e3ce..f5dba31 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -33,6 +33,7 @@
   { text: '记录表名称', value: 'logName', align: 'center' },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' },
   { text: '验收人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index b693cc2..4b77d5e 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -54,7 +54,7 @@
 // 校验规则
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   // groupCode: [{ required: true, message: '组别代码不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
@@ -200,7 +200,7 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
+            <el-form-item label="实验室" prop="labCode">
               <el-select v-model="form.labCode" :placeholder="pageType === 'detail' ? ' ' : '请选择实验室代码'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 2a23572..189269d 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -20,7 +20,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import { getStaffList } from '@/api/resource/register'
-import { addStandard, failUpdateStandard, getInfo, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
+import { addStandard, failUpdateStandard, getInfo, getStandardCertList, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
 import selectStaffPerson from '@/views/equipement/standard/book/dialog/selectPerson.vue'
 import { getUid } from '@/utils/getUid'
 import { getDeptIdByLabAndGroup } from '@/api/equipment/info/book'
@@ -64,6 +64,7 @@
   // buildStandardDate: '', // 建标日期
   standardCertNo: '', // 计量标准证书号
   lastReviewDate: '', // 最近复查日期
+  nextReviewDate: '', // 下次复查日期
   deptId: '', // 标准所在部门id
   deptName: '', // 标准所在部门名称
   directorId: '', // 标准负责人id
@@ -107,7 +108,7 @@
   labCodeName: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   majorType: [{ required: true, message: '专业类别不能为空', trigger: ['blur', 'change'] }],
   standardAlias: [{ required: true, message: '标准装置别名不能为空', trigger: ['blur', 'change'] }],
-  nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
+  // nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
   buildStandardReportPdfFile: [{ required: true, message: '建标报告（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   examTablePdfFile: [{ required: true, message: '考核表（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   createTime: [{ required: true, message: '创建时间不能为空', trigger: ['blur', 'change'] }],
@@ -258,6 +259,7 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         form.value[prop] = res.data[0]
+        event.target.value = null
         // 重置当前验证
         ElMessage.success(message)
         loading.close()
@@ -266,6 +268,8 @@
         ElMessage.error(res.message)
         loading.close()
       }
+    }).catch(() => {
+      event.target.value = null
     })
   }
 }
@@ -482,6 +486,25 @@
   }
 }
 // -------------------------------------------获取详情信息----------------------------------------
+// 获取最新一条标准证书
+const fetchLastStandardCert = (standardId: string) => {
+  if (!standardId) {
+    return
+  }
+  const params = {
+    id: standardId,
+    offset: 1,
+    limit: 20,
+  }
+  getStandardCertList(params).then((res) => {
+    if (res && res.data && res.data.rows && res.data.rows.length) {
+      const tempCert = res.data.rows[res.data.rows.length - 1]
+      form.value.lastReviewDate = tempCert.certificateDate // 最近复查日期-证书日期
+      form.value.nextReviewDate = tempCert.certificateExpireDate // 下次复查日期-证书有效期
+    }
+  })
+}
+
 /**
  * 获取详情
  * @param isCopy 是否备份，判断基本信息是否变化
@@ -530,6 +553,8 @@
       }
     }
     checkHasChanged()
+    // 如果有标准证书，最近复查日期和下次复查日期就需要用标准证书的证书日期和证书有效期
+    fetchLastStandardCert(infoId.value)
     loading.close()
   })
 }
@@ -796,24 +821,28 @@
   }
 }
 
-// 最近复查日期变化
+// 最近复查日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeLastReviewDate = (val: Date) => {
-  if (val) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
-  else {
-    form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (val) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
+  // else {
+  //   form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
-// 创建日期变化
+
+// 创建日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeCreateTime = (val: string) => {
-  if (!form.value.lastReviewDate) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (!form.value.lastReviewDate) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
 
 // 检查信息变化去标红字段
 function checkHasChanged() {
+  if (props.approvalStatusName !== '待审批') {
+    return
+  }
   const params = {
     technologyRelationList: technologyRelationList.value.map((item) => {
       return {
diff --git a/src/views/equipement/standard/book/components/certificate.vue b/src/views/equipement/standard/book/components/certificate.vue
index d214962..6c043f5 100644
--- a/src/views/equipement/standard/book/components/certificate.vue
+++ b/src/views/equipement/standard/book/components/certificate.vue
@@ -1,4 +1,4 @@
-<!-- 标准装置台账信息详情 校准证书 -->
+<!-- 标准装置台账信息详情 标准证书 -->
 <script name="StandardBookCertificate" lang="ts" setup>
 import { onMounted, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
@@ -33,8 +33,8 @@
   { text: '证书编号', value: 'certificateNo', align: 'center', required: true, width: '160' },
   { text: '证书名称', value: 'certificateName', align: 'center', required: true },
   { text: '出具单位', value: 'provideCompany', align: 'center', required: true },
-  { text: '证书日期', value: 'certificateDate', align: 'center', width: '120', required: true },
-  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '120', required: true },
+  { text: '证书日期', value: 'certificateDate', align: 'center', width: '180', required: true },
+  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '180', required: true },
   { text: '附件', value: 'attachmentFile', align: 'center', required: true },
 ]
 
@@ -109,7 +109,7 @@
   if (!useCheckList(list.value, columns, '标准证书')) {
     return false
   }
-  const tempParams = list.value.filter(item => !item.id) // 找到这次新增的数据（没有id的）
+  const tempParams = list.value.filter(item => !item.id).reverse() // 找到这次新增的数据（没有id的）
   const params = tempParams.map((item) => {
     return {
       ...item,
diff --git a/src/views/equipement/stateMaintenance/commonComponents/basic.vue b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
index 983ed68..9d3e10e 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
@@ -162,7 +162,16 @@
 const selectEquipmentDialogRef = ref() // 选择设备编号组件ref
 // 批量添加
 const selectEquipment = () => {
-  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', '4')
+  // approvalType: // 1启封、2封存、3禁用、4报废
+  const tempMap = { // 设备使用状态 1在用，2，禁用 3，报废 4，封存，5，延用
+    1: '4', // 1启封
+    2: '1', // 2封存
+    3: '', // 禁用
+    4: '', // 报废
+  } as any
+  const filterType = tempMap[props.approvalType]
+  console.log('========', filterType, props.approvalType)
+  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', filterType)
 }
 
 // 确定选择设备
diff --git a/src/views/resource/common/filterSample.vue b/src/views/resource/common/filterSample.vue
index a87bae1..e61e6e9 100644
--- a/src/views/resource/common/filterSample.vue
+++ b/src/views/resource/common/filterSample.vue
@@ -170,7 +170,7 @@
         <el-input v-model="customerName" :disabled="true" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.equipmentType" placeholder="设备类型" clearable>
+        <el-select v-model="listQuery.equipmentType" style="width: 220px;" placeholder="设备类型" clearable>
           <el-option v-for="dict in eqptCategoryDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index cf6e3ce..f5dba31 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -33,6 +33,7 @@
   { text: '记录表名称', value: 'logName', align: 'center' },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' },
   { text: '验收人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index b693cc2..4b77d5e 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -54,7 +54,7 @@
 // 校验规则
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   // groupCode: [{ required: true, message: '组别代码不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
@@ -200,7 +200,7 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
+            <el-form-item label="实验室" prop="labCode">
               <el-select v-model="form.labCode" :placeholder="pageType === 'detail' ? ' ' : '请选择实验室代码'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 2a23572..189269d 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -20,7 +20,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import { getStaffList } from '@/api/resource/register'
-import { addStandard, failUpdateStandard, getInfo, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
+import { addStandard, failUpdateStandard, getInfo, getStandardCertList, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
 import selectStaffPerson from '@/views/equipement/standard/book/dialog/selectPerson.vue'
 import { getUid } from '@/utils/getUid'
 import { getDeptIdByLabAndGroup } from '@/api/equipment/info/book'
@@ -64,6 +64,7 @@
   // buildStandardDate: '', // 建标日期
   standardCertNo: '', // 计量标准证书号
   lastReviewDate: '', // 最近复查日期
+  nextReviewDate: '', // 下次复查日期
   deptId: '', // 标准所在部门id
   deptName: '', // 标准所在部门名称
   directorId: '', // 标准负责人id
@@ -107,7 +108,7 @@
   labCodeName: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   majorType: [{ required: true, message: '专业类别不能为空', trigger: ['blur', 'change'] }],
   standardAlias: [{ required: true, message: '标准装置别名不能为空', trigger: ['blur', 'change'] }],
-  nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
+  // nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
   buildStandardReportPdfFile: [{ required: true, message: '建标报告（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   examTablePdfFile: [{ required: true, message: '考核表（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   createTime: [{ required: true, message: '创建时间不能为空', trigger: ['blur', 'change'] }],
@@ -258,6 +259,7 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         form.value[prop] = res.data[0]
+        event.target.value = null
         // 重置当前验证
         ElMessage.success(message)
         loading.close()
@@ -266,6 +268,8 @@
         ElMessage.error(res.message)
         loading.close()
       }
+    }).catch(() => {
+      event.target.value = null
     })
   }
 }
@@ -482,6 +486,25 @@
   }
 }
 // -------------------------------------------获取详情信息----------------------------------------
+// 获取最新一条标准证书
+const fetchLastStandardCert = (standardId: string) => {
+  if (!standardId) {
+    return
+  }
+  const params = {
+    id: standardId,
+    offset: 1,
+    limit: 20,
+  }
+  getStandardCertList(params).then((res) => {
+    if (res && res.data && res.data.rows && res.data.rows.length) {
+      const tempCert = res.data.rows[res.data.rows.length - 1]
+      form.value.lastReviewDate = tempCert.certificateDate // 最近复查日期-证书日期
+      form.value.nextReviewDate = tempCert.certificateExpireDate // 下次复查日期-证书有效期
+    }
+  })
+}
+
 /**
  * 获取详情
  * @param isCopy 是否备份，判断基本信息是否变化
@@ -530,6 +553,8 @@
       }
     }
     checkHasChanged()
+    // 如果有标准证书，最近复查日期和下次复查日期就需要用标准证书的证书日期和证书有效期
+    fetchLastStandardCert(infoId.value)
     loading.close()
   })
 }
@@ -796,24 +821,28 @@
   }
 }
 
-// 最近复查日期变化
+// 最近复查日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeLastReviewDate = (val: Date) => {
-  if (val) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
-  else {
-    form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (val) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
+  // else {
+  //   form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
-// 创建日期变化
+
+// 创建日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeCreateTime = (val: string) => {
-  if (!form.value.lastReviewDate) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (!form.value.lastReviewDate) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
 
 // 检查信息变化去标红字段
 function checkHasChanged() {
+  if (props.approvalStatusName !== '待审批') {
+    return
+  }
   const params = {
     technologyRelationList: technologyRelationList.value.map((item) => {
       return {
diff --git a/src/views/equipement/standard/book/components/certificate.vue b/src/views/equipement/standard/book/components/certificate.vue
index d214962..6c043f5 100644
--- a/src/views/equipement/standard/book/components/certificate.vue
+++ b/src/views/equipement/standard/book/components/certificate.vue
@@ -1,4 +1,4 @@
-<!-- 标准装置台账信息详情 校准证书 -->
+<!-- 标准装置台账信息详情 标准证书 -->
 <script name="StandardBookCertificate" lang="ts" setup>
 import { onMounted, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
@@ -33,8 +33,8 @@
   { text: '证书编号', value: 'certificateNo', align: 'center', required: true, width: '160' },
   { text: '证书名称', value: 'certificateName', align: 'center', required: true },
   { text: '出具单位', value: 'provideCompany', align: 'center', required: true },
-  { text: '证书日期', value: 'certificateDate', align: 'center', width: '120', required: true },
-  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '120', required: true },
+  { text: '证书日期', value: 'certificateDate', align: 'center', width: '180', required: true },
+  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '180', required: true },
   { text: '附件', value: 'attachmentFile', align: 'center', required: true },
 ]
 
@@ -109,7 +109,7 @@
   if (!useCheckList(list.value, columns, '标准证书')) {
     return false
   }
-  const tempParams = list.value.filter(item => !item.id) // 找到这次新增的数据（没有id的）
+  const tempParams = list.value.filter(item => !item.id).reverse() // 找到这次新增的数据（没有id的）
   const params = tempParams.map((item) => {
     return {
       ...item,
diff --git a/src/views/equipement/stateMaintenance/commonComponents/basic.vue b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
index 983ed68..9d3e10e 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
@@ -162,7 +162,16 @@
 const selectEquipmentDialogRef = ref() // 选择设备编号组件ref
 // 批量添加
 const selectEquipment = () => {
-  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', '4')
+  // approvalType: // 1启封、2封存、3禁用、4报废
+  const tempMap = { // 设备使用状态 1在用，2，禁用 3，报废 4，封存，5，延用
+    1: '4', // 1启封
+    2: '1', // 2封存
+    3: '', // 禁用
+    4: '', // 报废
+  } as any
+  const filterType = tempMap[props.approvalType]
+  console.log('========', filterType, props.approvalType)
+  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', filterType)
 }
 
 // 确定选择设备
diff --git a/src/views/resource/common/filterSample.vue b/src/views/resource/common/filterSample.vue
index a87bae1..e61e6e9 100644
--- a/src/views/resource/common/filterSample.vue
+++ b/src/views/resource/common/filterSample.vue
@@ -170,7 +170,7 @@
         <el-input v-model="customerName" :disabled="true" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.equipmentType" placeholder="设备类型" clearable>
+        <el-select v-model="listQuery.equipmentType" style="width: 220px;" placeholder="设备类型" clearable>
           <el-option v-for="dict in eqptCategoryDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
diff --git a/src/views/resource/customer/reviewNotice/customer-notice.ts b/src/views/resource/customer/reviewNotice/customer-notice.ts
index a31f926..935e413 100644
--- a/src/views/resource/customer/reviewNotice/customer-notice.ts
+++ b/src/views/resource/customer/reviewNotice/customer-notice.ts
@@ -52,6 +52,8 @@
   deptId: string
   labCode: string
   labCodeName?: string
+  groupCode?: string // 部门
+  groupCodeName?: string // 部门名称
   noticeUserId: string
   noticeUserName?: string
   noticeNo: string

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index cf6e3ce..f5dba31 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -33,6 +33,7 @@
   { text: '记录表名称', value: 'logName', align: 'center' },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' },
   { text: '验收人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index b693cc2..4b77d5e 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -54,7 +54,7 @@
 // 校验规则
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   // groupCode: [{ required: true, message: '组别代码不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
@@ -200,7 +200,7 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
+            <el-form-item label="实验室" prop="labCode">
               <el-select v-model="form.labCode" :placeholder="pageType === 'detail' ? ' ' : '请选择实验室代码'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 2a23572..189269d 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -20,7 +20,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import { getStaffList } from '@/api/resource/register'
-import { addStandard, failUpdateStandard, getInfo, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
+import { addStandard, failUpdateStandard, getInfo, getStandardCertList, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
 import selectStaffPerson from '@/views/equipement/standard/book/dialog/selectPerson.vue'
 import { getUid } from '@/utils/getUid'
 import { getDeptIdByLabAndGroup } from '@/api/equipment/info/book'
@@ -64,6 +64,7 @@
   // buildStandardDate: '', // 建标日期
   standardCertNo: '', // 计量标准证书号
   lastReviewDate: '', // 最近复查日期
+  nextReviewDate: '', // 下次复查日期
   deptId: '', // 标准所在部门id
   deptName: '', // 标准所在部门名称
   directorId: '', // 标准负责人id
@@ -107,7 +108,7 @@
   labCodeName: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   majorType: [{ required: true, message: '专业类别不能为空', trigger: ['blur', 'change'] }],
   standardAlias: [{ required: true, message: '标准装置别名不能为空', trigger: ['blur', 'change'] }],
-  nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
+  // nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
   buildStandardReportPdfFile: [{ required: true, message: '建标报告（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   examTablePdfFile: [{ required: true, message: '考核表（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   createTime: [{ required: true, message: '创建时间不能为空', trigger: ['blur', 'change'] }],
@@ -258,6 +259,7 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         form.value[prop] = res.data[0]
+        event.target.value = null
         // 重置当前验证
         ElMessage.success(message)
         loading.close()
@@ -266,6 +268,8 @@
         ElMessage.error(res.message)
         loading.close()
       }
+    }).catch(() => {
+      event.target.value = null
     })
   }
 }
@@ -482,6 +486,25 @@
   }
 }
 // -------------------------------------------获取详情信息----------------------------------------
+// 获取最新一条标准证书
+const fetchLastStandardCert = (standardId: string) => {
+  if (!standardId) {
+    return
+  }
+  const params = {
+    id: standardId,
+    offset: 1,
+    limit: 20,
+  }
+  getStandardCertList(params).then((res) => {
+    if (res && res.data && res.data.rows && res.data.rows.length) {
+      const tempCert = res.data.rows[res.data.rows.length - 1]
+      form.value.lastReviewDate = tempCert.certificateDate // 最近复查日期-证书日期
+      form.value.nextReviewDate = tempCert.certificateExpireDate // 下次复查日期-证书有效期
+    }
+  })
+}
+
 /**
  * 获取详情
  * @param isCopy 是否备份，判断基本信息是否变化
@@ -530,6 +553,8 @@
       }
     }
     checkHasChanged()
+    // 如果有标准证书，最近复查日期和下次复查日期就需要用标准证书的证书日期和证书有效期
+    fetchLastStandardCert(infoId.value)
     loading.close()
   })
 }
@@ -796,24 +821,28 @@
   }
 }
 
-// 最近复查日期变化
+// 最近复查日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeLastReviewDate = (val: Date) => {
-  if (val) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
-  else {
-    form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (val) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
+  // else {
+  //   form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
-// 创建日期变化
+
+// 创建日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeCreateTime = (val: string) => {
-  if (!form.value.lastReviewDate) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (!form.value.lastReviewDate) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
 
 // 检查信息变化去标红字段
 function checkHasChanged() {
+  if (props.approvalStatusName !== '待审批') {
+    return
+  }
   const params = {
     technologyRelationList: technologyRelationList.value.map((item) => {
       return {
diff --git a/src/views/equipement/standard/book/components/certificate.vue b/src/views/equipement/standard/book/components/certificate.vue
index d214962..6c043f5 100644
--- a/src/views/equipement/standard/book/components/certificate.vue
+++ b/src/views/equipement/standard/book/components/certificate.vue
@@ -1,4 +1,4 @@
-<!-- 标准装置台账信息详情 校准证书 -->
+<!-- 标准装置台账信息详情 标准证书 -->
 <script name="StandardBookCertificate" lang="ts" setup>
 import { onMounted, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
@@ -33,8 +33,8 @@
   { text: '证书编号', value: 'certificateNo', align: 'center', required: true, width: '160' },
   { text: '证书名称', value: 'certificateName', align: 'center', required: true },
   { text: '出具单位', value: 'provideCompany', align: 'center', required: true },
-  { text: '证书日期', value: 'certificateDate', align: 'center', width: '120', required: true },
-  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '120', required: true },
+  { text: '证书日期', value: 'certificateDate', align: 'center', width: '180', required: true },
+  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '180', required: true },
   { text: '附件', value: 'attachmentFile', align: 'center', required: true },
 ]
 
@@ -109,7 +109,7 @@
   if (!useCheckList(list.value, columns, '标准证书')) {
     return false
   }
-  const tempParams = list.value.filter(item => !item.id) // 找到这次新增的数据（没有id的）
+  const tempParams = list.value.filter(item => !item.id).reverse() // 找到这次新增的数据（没有id的）
   const params = tempParams.map((item) => {
     return {
       ...item,
diff --git a/src/views/equipement/stateMaintenance/commonComponents/basic.vue b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
index 983ed68..9d3e10e 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
@@ -162,7 +162,16 @@
 const selectEquipmentDialogRef = ref() // 选择设备编号组件ref
 // 批量添加
 const selectEquipment = () => {
-  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', '4')
+  // approvalType: // 1启封、2封存、3禁用、4报废
+  const tempMap = { // 设备使用状态 1在用，2，禁用 3，报废 4，封存，5，延用
+    1: '4', // 1启封
+    2: '1', // 2封存
+    3: '', // 禁用
+    4: '', // 报废
+  } as any
+  const filterType = tempMap[props.approvalType]
+  console.log('========', filterType, props.approvalType)
+  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', filterType)
 }
 
 // 确定选择设备
diff --git a/src/views/resource/common/filterSample.vue b/src/views/resource/common/filterSample.vue
index a87bae1..e61e6e9 100644
--- a/src/views/resource/common/filterSample.vue
+++ b/src/views/resource/common/filterSample.vue
@@ -170,7 +170,7 @@
         <el-input v-model="customerName" :disabled="true" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.equipmentType" placeholder="设备类型" clearable>
+        <el-select v-model="listQuery.equipmentType" style="width: 220px;" placeholder="设备类型" clearable>
           <el-option v-for="dict in eqptCategoryDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
diff --git a/src/views/resource/customer/reviewNotice/customer-notice.ts b/src/views/resource/customer/reviewNotice/customer-notice.ts
index a31f926..935e413 100644
--- a/src/views/resource/customer/reviewNotice/customer-notice.ts
+++ b/src/views/resource/customer/reviewNotice/customer-notice.ts
@@ -52,6 +52,8 @@
   deptId: string
   labCode: string
   labCodeName?: string
+  groupCode?: string // 部门
+  groupCodeName?: string // 部门名称
   noticeUserId: string
   noticeUserName?: string
   noticeNo: string
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index dce4c24..ebe393d 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -50,8 +50,10 @@
   customerId: '',
   customerName: '',
   deptId: '',
-  labCode: '',
-  labCodeName: '',
+  labCode: '', // 实验室
+  labCodeName: '', // 实验室名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   noticeUserId: '',
   noticeUserName: '',
   noticeNo: '',
@@ -76,7 +78,8 @@
 })
 
 const noticeFormRules = ref({
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   deptId: [{ required: true, message: '委托单位不能为空', trigger: ['change', 'blur'] }],
   returnDate: [{ required: true, message: '寄回日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -90,7 +93,8 @@
 const editButtVisable = ref<boolean>(false) // 是否显示 编辑 按钮
 
 // 字典值
-const labCodeDict = ref<IDictType[]>([])
+const labCodeDict = ref<IDictType[]>([]) // 实验室
+const groupCodeDict = ref<IDictType[]>([]) // 部门
 const eqptMeterIdentifyDict = ref<IDictType[]>([])
 
 const sampleList = ref<ISampleEquipment[]>([])
@@ -209,7 +213,7 @@
       noticeInfo.value.id = res.data.id
       id.value = res.data.id
 
-      type.value = 'update'
+      // type.value = 'update'
       status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
     }
     else {
@@ -506,7 +510,8 @@
   })
 }
 
-const getLabCodeDict = async () => {
+// ==================================================字典==========================================
+const getLabCodeDict = async () => { // 实验室
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
     // 缓存中没有则调用接口查询
@@ -521,6 +526,13 @@
     labCodeDict.value = JSON.parse(sessionStorage.getItem('bizLabCode')!)
   }
 }
+// 部门
+const getGroupCodeDict = () => {
+  getDictByCode('bizGroupCode').then((response) => {
+    groupCodeDict.value = response.data
+  })
+}
+// ========================================================================================================
 
 const getEqptMeterIdentifyDict = async () => {
   // 先从缓存中获取
@@ -593,7 +605,8 @@
 }
 
 const initDict = () => {
-  getLabCodeDict()
+  getLabCodeDict() // 获取实验室
+  getGroupCodeDict() // 获取部门
   getEqptMeterIdentifyDict()
 }
 
@@ -659,7 +672,7 @@
           <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
-          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
+          <el-button v-if="saveButtVisable" type="primary" :disabled="type === 'create' && id !== ''" @click="saveButtonHandler">
             保存
           </el-button>
 
@@ -675,79 +688,83 @@
           </el-button>
         </template>
 
-        <el-radio-group v-model="currentLabel" style="margin-bottom: 20px;" @change="radioChangeHandler">
+        <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
           <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
         </el-radio-group>
-
-        <template v-if="current === 'notice-basic'">
-          <el-row :gutter="24">
-            <!-- 第一行 第一列 -->
-            <el-col :span="6">
-              <el-form-item label="实验室" prop="labCode">
-                <el-select v-model="noticeInfo.labCode" placeholder="请选择实验室代码" tabindex="1" :disabled="keyFieldsDisable" style="width: 100%;">
-                  <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-                </el-select>
-                <el-input v-model="noticeInfo.labCodeName" type="hidden" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="文件编号">
-                <el-input v-model="noticeInfo.noticeNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="文件名称">
-                <el-input v-model="noticeInfo.noticeName" :disabled="true" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="委托方" prop="deptId">
-                <el-input v-model="noticeInfo.customerId" type="hidden" />
-                <el-input v-model="noticeInfo.deptId" type="hidden" />
-                <el-input v-model="noticeInfo.customerName" placeholder="请选择委托单位" :disabled="true">
-                  <template #append>
-                    <el-button size="small" :disabled="type === 'detail'" @click="showCustomerFilter">
-                      选择
-                    </el-button>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="要求寄回时间" prop="returnDate">
-                <el-date-picker
-                  v-model="noticeInfo.returnDate" type="date"
-                  format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                  placeholder="请选择寄回时间" :clearable="true" :disabled="type === 'detail'"
-                  style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="创建人">
-                <el-input v-model="noticeInfo.noticeName" type="hidden" />
-                <el-input v-model="noticeInfo.createUserId" type="hidden" />
-                <el-input v-model="noticeInfo.createUserName" :disabled="true" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="创建时间">
-                <el-input v-model="noticeInfo.createTime" :disabled="true" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
       </detail-page>
+      <detail-block v-if="current === 'notice-basic'" title="">
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="noticeInfo.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable" style="width: 100%;">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="noticeInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-      <template v-if="current === 'notice-basic'">
+          <el-col :span="6">
+            <el-form-item label="文件编号">
+              <el-input v-model="noticeInfo.noticeNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="文件名称">
+              <el-input v-model="noticeInfo.noticeName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="委托方" prop="deptId">
+              <el-input v-model="noticeInfo.customerId" type="hidden" />
+              <el-input v-model="noticeInfo.deptId" type="hidden" />
+              <el-input v-model="noticeInfo.customerName" placeholder="请选择委托单位" :disabled="true">
+                <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showCustomerFilter">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="要求寄回时间" prop="returnDate">
+              <el-date-picker
+                v-model="noticeInfo.returnDate" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择寄回时间" :clearable="true" :disabled="type === 'detail'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model="noticeInfo.noticeName" type="hidden" />
+              <el-input v-model="noticeInfo.createUserId" type="hidden" />
+              <el-input v-model="noticeInfo.createUserName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model="noticeInfo.createTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </detail-block>
+      <detail-block v-if="current === 'notice-basic'" title="">
         <table-container title="复查设备清单">
           <template v-if="type !== 'detail'" #btns-right>
             <el-button type="primary" @click="addEditableRow()">
@@ -776,7 +793,7 @@
             </el-table-column>
           </el-table>
         </table-container>
-      </template>
+      </detail-block>
     </el-form>
 
     <approval-dialog

diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3633475..509b96f 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -102,7 +102,7 @@
 
   // 检校标准装置
   getDictByCode('bizStandardEquipmentType').then((response) => {
-    standardList.value = response.data.map((item) => {
+    standardList.value = response.data.map((item: { name: string }) => {
       return {
         value: item.name,
       }
diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue
index ff46afc..bbe8356 100644
--- a/src/views/business/manager/order/detail.vue
+++ b/src/views/business/manager/order/detail.vue
@@ -665,7 +665,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="使用部门" prop="deptId">
+              <el-form-item label="使用部门" :prop="form.receiveStatus === '2' ? '' : 'deptId'">
                 <el-input v-if="pageType === 'detail' || form.dataSource === '受检设备系统'" v-model.trim="form.deptName" disabled />
                 <el-tree-select
                   v-if="pageType !== 'detail' && form.dataSource === '计量业务系统'"
@@ -748,7 +748,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="!isFold" v-if="form.isOnSiteCheck === 0" :span="6">
-              <el-form-item label="要求检完时间:" prop="requireOverTime">
+              <el-form-item label="要求检完时间:" :prop="form.receiveStatus === '2' ? '' : 'requireOverTime'">
                 <el-date-picker
                   v-model="form.requireOverTime"
                   type="datetime"
diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
index ffc85b4..0b74bb5 100644
--- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
+++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue
@@ -32,8 +32,8 @@
   { text: '参数', value: 'params', align: 'center', required: true },
   { text: '量', value: 'capacity', align: 'center', width: '120', required: true },
   { text: '单位', value: 'unit', align: 'center', width: '120', required: true },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, reg: isNumber, validMessage: '要求为数字' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' },
+  { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } },
   { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true },
@@ -452,7 +452,10 @@
           <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
         </template>
         <template #default="scope">
-          <el-input
+          <!-- <el-input
+            v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
+          /> -->
+          <el-input-number
             v-if="props.pageType !== 'detail' && (item.value === 'measureIndicationValue' || item.value === 'standardValue' || item.value === 'errorParamA' || item.value === 'errorParamB' || item.value === 'standardValue')" v-model.trim="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input"
           />
           <!-- 频率 -->
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index c59e3b8..1fbe374 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -1230,7 +1230,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_1">
-                <el-select v-model="itemFormData.aEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '1')">
+                <el-select v-model="itemFormData.aEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1268,7 +1268,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_1">
-                <el-select v-model="itemFormData.bEquipmentId_1" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '1')">
+                <el-select v-model="itemFormData.bEquipmentId_1" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '1')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_1" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1333,7 +1333,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_2">
-                <el-select v-model="itemFormData.aEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '2')">
+                <el-select v-model="itemFormData.aEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1368,7 +1368,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_2">
-                <el-select v-model="itemFormData.bEquipmentId_2" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '2')">
+                <el-select v-model="itemFormData.bEquipmentId_2" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '2')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_2" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1442,7 +1442,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_3">
-                <el-select v-model="itemFormData.aEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '3')">
+                <el-select v-model="itemFormData.aEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1477,7 +1477,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_3">
-                <el-select v-model="itemFormData.bEquipmentId_3" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '3')">
+                <el-select v-model="itemFormData.bEquipmentId_3" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentB(val, '3')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_3" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1540,7 +1540,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_4">
-                <el-select v-model="itemFormData.aEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '4')">
+                <el-select v-model="itemFormData.aEquipmentId_4" style="width: 220px;" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" @change="(val: any) => selectEquipmentA(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1575,7 +1575,7 @@
             <!-- 载荷点B -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点B:" prop="bEquipmentId_4">
-                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentB(val, '4')">
+                <el-select v-model="itemFormData.bEquipmentId_4" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentB(val, '4')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_4" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1641,7 +1641,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_5">
-                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '5')">
+                <el-select v-model="itemFormData.aEquipmentId_5" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '5')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_5" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
@@ -1734,7 +1734,7 @@
             <!-- 载荷点A -->
             <el-col :span="18" style="display: flex;">
               <el-form-item label="载荷点A:" prop="aEquipmentId_6">
-                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" class="full-width-input" @change="(val) => selectEquipmentA(val, '6')">
+                <el-select v-model="itemFormData.aEquipmentId_6" clearable :placeholder="pageType === 'detail' ? ' ' : '请选择设备'" :disabled="pageType === 'detail' || itemFormData.appearance === '0'" style="width: 220px;" @change="(val: any) => selectEquipmentA(val, '6')">
                   <el-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.aEquipmentId_6" :label="item.manufactureNo" :value="item.id">
                     <span style="float: left;">{{ item.equipmentName }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px;">{{ item.manufactureNo }}</span>
diff --git a/src/views/business/taskMeasure/print/detail.vue b/src/views/business/taskMeasure/print/detail.vue
index 46c8389..55269df 100644
--- a/src/views/business/taskMeasure/print/detail.vue
+++ b/src/views/business/taskMeasure/print/detail.vue
@@ -48,7 +48,7 @@
   eqptMeterIdentifyList.value = response.data
 
   // 计量标识
-  const responseMeterIdentify = await getDictByCode('bizMeterIdentify')
+  const responseMeterIdentify = await getDictByCode('eqptMeterIdentify')
   responseMeterIdentify.data.forEach((item: { value: string; name: string }) => {
     meterIdentifyMap.value[`${item.value}`] = item.name
   })
diff --git a/src/views/equipement/info/book/components/basic.vue b/src/views/equipement/info/book/components/basic.vue
index 5f1c0c4..e8d03e6 100644
--- a/src/views/equipement/info/book/components/basic.vue
+++ b/src/views/equipement/info/book/components/basic.vue
@@ -191,6 +191,10 @@
 const confirmSelectUnpackRecord = (val: any) => {
   form.value.unpackRecordId = val[0].id // 开箱验收id
   form.value.unpackRecordName = val[0].logName // 开箱验收名称
+  form.value.equipmentName = val[0].equipmentName // 设备名称
+  form.value.model = val[0].model // 型号
+  form.value.manufactureNo = val[0].manufactureNo // 出厂编号
+  form.value.manufacturer = val[0].manufacturer // 生产厂家
 }
 // 详情时点击开箱记录链接
 const handleClickUnpackRecordLink = () => {
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index cf6e3ce..f5dba31 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -33,6 +33,7 @@
   { text: '记录表名称', value: 'logName', align: 'center' },
   { text: '设备名称', value: 'equipmentName', align: 'center' },
   { text: '型号', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
   { text: '生产厂家', value: 'manufacturer', align: 'center' },
   { text: '到货时间', value: 'arrivalTime', align: 'center', width: '180' },
   { text: '验收人', value: 'createUserName', align: 'center' },
diff --git a/src/views/equipement/monitor/radio/detail.vue b/src/views/equipement/monitor/radio/detail.vue
index b693cc2..4b77d5e 100644
--- a/src/views/equipement/monitor/radio/detail.vue
+++ b/src/views/equipement/monitor/radio/detail.vue
@@ -54,7 +54,7 @@
 // 校验规则
 const formRules = ref({
   equipmentName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   // groupCode: [{ required: true, message: '组别代码不能为空', trigger: ['blur', 'change'] }],
 })
 // -------------------------------------------字典------------------------------------------
@@ -200,7 +200,7 @@
       >
         <el-row :gutter="24">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
+            <el-form-item label="实验室" prop="labCode">
               <el-select v-model="form.labCode" :placeholder="pageType === 'detail' ? ' ' : '请选择实验室代码'" :disabled="pageType === 'detail'" class="full-width-input">
                 <el-option v-for="item in labCodeList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
diff --git a/src/views/equipement/standard/book/components/basic.vue b/src/views/equipement/standard/book/components/basic.vue
index 2a23572..189269d 100644
--- a/src/views/equipement/standard/book/components/basic.vue
+++ b/src/views/equipement/standard/book/components/basic.vue
@@ -20,7 +20,7 @@
 import { useCheckList } from '@/commonMethods/useCheckList'
 import { useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable'
 import { getStaffList } from '@/api/resource/register'
-import { addStandard, failUpdateStandard, getInfo, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
+import { addStandard, failUpdateStandard, getInfo, getStandardCertList, hasChanged, submit, updateStandard } from '@/api/equipment/standard/book'
 import selectStaffPerson from '@/views/equipement/standard/book/dialog/selectPerson.vue'
 import { getUid } from '@/utils/getUid'
 import { getDeptIdByLabAndGroup } from '@/api/equipment/info/book'
@@ -64,6 +64,7 @@
   // buildStandardDate: '', // 建标日期
   standardCertNo: '', // 计量标准证书号
   lastReviewDate: '', // 最近复查日期
+  nextReviewDate: '', // 下次复查日期
   deptId: '', // 标准所在部门id
   deptName: '', // 标准所在部门名称
   directorId: '', // 标准负责人id
@@ -107,7 +108,7 @@
   labCodeName: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }],
   majorType: [{ required: true, message: '专业类别不能为空', trigger: ['blur', 'change'] }],
   standardAlias: [{ required: true, message: '标准装置别名不能为空', trigger: ['blur', 'change'] }],
-  nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
+  // nextReviewDate: [{ required: true, message: '下次复查日期不能为空', trigger: ['blur', 'change'] }],
   buildStandardReportPdfFile: [{ required: true, message: '建标报告（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   examTablePdfFile: [{ required: true, message: '考核表（pdf版本）不能为空', trigger: ['blur', 'change'] }],
   createTime: [{ required: true, message: '创建时间不能为空', trigger: ['blur', 'change'] }],
@@ -258,6 +259,7 @@
     UploadFile(fd).then((res) => {
       if (res.code === 200) {
         form.value[prop] = res.data[0]
+        event.target.value = null
         // 重置当前验证
         ElMessage.success(message)
         loading.close()
@@ -266,6 +268,8 @@
         ElMessage.error(res.message)
         loading.close()
       }
+    }).catch(() => {
+      event.target.value = null
     })
   }
 }
@@ -482,6 +486,25 @@
   }
 }
 // -------------------------------------------获取详情信息----------------------------------------
+// 获取最新一条标准证书
+const fetchLastStandardCert = (standardId: string) => {
+  if (!standardId) {
+    return
+  }
+  const params = {
+    id: standardId,
+    offset: 1,
+    limit: 20,
+  }
+  getStandardCertList(params).then((res) => {
+    if (res && res.data && res.data.rows && res.data.rows.length) {
+      const tempCert = res.data.rows[res.data.rows.length - 1]
+      form.value.lastReviewDate = tempCert.certificateDate // 最近复查日期-证书日期
+      form.value.nextReviewDate = tempCert.certificateExpireDate // 下次复查日期-证书有效期
+    }
+  })
+}
+
 /**
  * 获取详情
  * @param isCopy 是否备份，判断基本信息是否变化
@@ -530,6 +553,8 @@
       }
     }
     checkHasChanged()
+    // 如果有标准证书，最近复查日期和下次复查日期就需要用标准证书的证书日期和证书有效期
+    fetchLastStandardCert(infoId.value)
     loading.close()
   })
 }
@@ -796,24 +821,28 @@
   }
 }
 
-// 最近复查日期变化
+// 最近复查日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeLastReviewDate = (val: Date) => {
-  if (val) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
-  else {
-    form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (val) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
+  // else {
+  //   form.value.nextReviewDate = dayjs(form.value.createTime).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
-// 创建日期变化
+
+// 创建日期变化--修改下次复查日期（此逻辑暂时去掉，新逻辑最近复查日期和下次复查日期从标准证书中取）
 const changeCreateTime = (val: string) => {
-  if (!form.value.lastReviewDate) {
-    form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
-  }
+  // if (!form.value.lastReviewDate) {
+  //   form.value.nextReviewDate = dayjs(val).add(5, 'year').format('YYYY-MM-DD')
+  // }
 }
 
 // 检查信息变化去标红字段
 function checkHasChanged() {
+  if (props.approvalStatusName !== '待审批') {
+    return
+  }
   const params = {
     technologyRelationList: technologyRelationList.value.map((item) => {
       return {
diff --git a/src/views/equipement/standard/book/components/certificate.vue b/src/views/equipement/standard/book/components/certificate.vue
index d214962..6c043f5 100644
--- a/src/views/equipement/standard/book/components/certificate.vue
+++ b/src/views/equipement/standard/book/components/certificate.vue
@@ -1,4 +1,4 @@
-<!-- 标准装置台账信息详情 校准证书 -->
+<!-- 标准装置台账信息详情 标准证书 -->
 <script name="StandardBookCertificate" lang="ts" setup>
 import { onMounted, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
@@ -33,8 +33,8 @@
   { text: '证书编号', value: 'certificateNo', align: 'center', required: true, width: '160' },
   { text: '证书名称', value: 'certificateName', align: 'center', required: true },
   { text: '出具单位', value: 'provideCompany', align: 'center', required: true },
-  { text: '证书日期', value: 'certificateDate', align: 'center', width: '120', required: true },
-  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '120', required: true },
+  { text: '证书日期', value: 'certificateDate', align: 'center', width: '180', required: true },
+  { text: '证书有效期', value: 'certificateExpireDate', align: 'center', width: '180', required: true },
   { text: '附件', value: 'attachmentFile', align: 'center', required: true },
 ]
 
@@ -109,7 +109,7 @@
   if (!useCheckList(list.value, columns, '标准证书')) {
     return false
   }
-  const tempParams = list.value.filter(item => !item.id) // 找到这次新增的数据（没有id的）
+  const tempParams = list.value.filter(item => !item.id).reverse() // 找到这次新增的数据（没有id的）
   const params = tempParams.map((item) => {
     return {
       ...item,
diff --git a/src/views/equipement/stateMaintenance/commonComponents/basic.vue b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
index 983ed68..9d3e10e 100644
--- a/src/views/equipement/stateMaintenance/commonComponents/basic.vue
+++ b/src/views/equipement/stateMaintenance/commonComponents/basic.vue
@@ -162,7 +162,16 @@
 const selectEquipmentDialogRef = ref() // 选择设备编号组件ref
 // 批量添加
 const selectEquipment = () => {
-  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', '4')
+  // approvalType: // 1启封、2封存、3禁用、4报废
+  const tempMap = { // 设备使用状态 1在用，2，禁用 3，报废 4，封存，5，延用
+    1: '4', // 1启封
+    2: '1', // 2封存
+    3: '', // 禁用
+    4: '', // 报废
+  } as any
+  const filterType = tempMap[props.approvalType]
+  console.log('========', filterType, props.approvalType)
+  selectEquipmentDialogRef.value.initDialog(user.bizLabCode, user.groupNo, 'noChange', filterType)
 }
 
 // 确定选择设备
diff --git a/src/views/resource/common/filterSample.vue b/src/views/resource/common/filterSample.vue
index a87bae1..e61e6e9 100644
--- a/src/views/resource/common/filterSample.vue
+++ b/src/views/resource/common/filterSample.vue
@@ -170,7 +170,7 @@
         <el-input v-model="customerName" :disabled="true" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.equipmentType" placeholder="设备类型" clearable>
+        <el-select v-model="listQuery.equipmentType" style="width: 220px;" placeholder="设备类型" clearable>
           <el-option v-for="dict in eqptCategoryDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
diff --git a/src/views/resource/customer/reviewNotice/customer-notice.ts b/src/views/resource/customer/reviewNotice/customer-notice.ts
index a31f926..935e413 100644
--- a/src/views/resource/customer/reviewNotice/customer-notice.ts
+++ b/src/views/resource/customer/reviewNotice/customer-notice.ts
@@ -52,6 +52,8 @@
   deptId: string
   labCode: string
   labCodeName?: string
+  groupCode?: string // 部门
+  groupCodeName?: string // 部门名称
   noticeUserId: string
   noticeUserName?: string
   noticeNo: string
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index dce4c24..ebe393d 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -50,8 +50,10 @@
   customerId: '',
   customerName: '',
   deptId: '',
-  labCode: '',
-  labCodeName: '',
+  labCode: '', // 实验室
+  labCodeName: '', // 实验室名称
+  groupCode: '', // 部门
+  groupCodeName: '', // 部门名称
   noticeUserId: '',
   noticeUserName: '',
   noticeNo: '',
@@ -76,7 +78,8 @@
 })
 
 const noticeFormRules = ref({
-  labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
+  labCode: [{ required: true, message: '实验室不能为空', trigger: ['change', 'blur'] }],
+  groupCode: [{ required: true, message: '部门不能为空', trigger: ['change', 'blur'] }],
   deptId: [{ required: true, message: '委托单位不能为空', trigger: ['change', 'blur'] }],
   returnDate: [{ required: true, message: '寄回日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
@@ -90,7 +93,8 @@
 const editButtVisable = ref<boolean>(false) // 是否显示 编辑 按钮
 
 // 字典值
-const labCodeDict = ref<IDictType[]>([])
+const labCodeDict = ref<IDictType[]>([]) // 实验室
+const groupCodeDict = ref<IDictType[]>([]) // 部门
 const eqptMeterIdentifyDict = ref<IDictType[]>([])
 
 const sampleList = ref<ISampleEquipment[]>([])
@@ -209,7 +213,7 @@
       noticeInfo.value.id = res.data.id
       id.value = res.data.id
 
-      type.value = 'update'
+      // type.value = 'update'
       status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
     }
     else {
@@ -506,7 +510,8 @@
   })
 }
 
-const getLabCodeDict = async () => {
+// ==================================================字典==========================================
+const getLabCodeDict = async () => { // 实验室
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
     // 缓存中没有则调用接口查询
@@ -521,6 +526,13 @@
     labCodeDict.value = JSON.parse(sessionStorage.getItem('bizLabCode')!)
   }
 }
+// 部门
+const getGroupCodeDict = () => {
+  getDictByCode('bizGroupCode').then((response) => {
+    groupCodeDict.value = response.data
+  })
+}
+// ========================================================================================================
 
 const getEqptMeterIdentifyDict = async () => {
   // 先从缓存中获取
@@ -593,7 +605,8 @@
 }
 
 const initDict = () => {
-  getLabCodeDict()
+  getLabCodeDict() // 获取实验室
+  getGroupCodeDict() // 获取部门
   getEqptMeterIdentifyDict()
 }
 
@@ -659,7 +672,7 @@
           <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
             提交
           </el-button>
-          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
+          <el-button v-if="saveButtVisable" type="primary" :disabled="type === 'create' && id !== ''" @click="saveButtonHandler">
             保存
           </el-button>
 
@@ -675,79 +688,83 @@
           </el-button>
         </template>
 
-        <el-radio-group v-model="currentLabel" style="margin-bottom: 20px;" @change="radioChangeHandler">
+        <el-radio-group v-model="currentLabel" @change="radioChangeHandler">
           <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
         </el-radio-group>
-
-        <template v-if="current === 'notice-basic'">
-          <el-row :gutter="24">
-            <!-- 第一行 第一列 -->
-            <el-col :span="6">
-              <el-form-item label="实验室" prop="labCode">
-                <el-select v-model="noticeInfo.labCode" placeholder="请选择实验室代码" tabindex="1" :disabled="keyFieldsDisable" style="width: 100%;">
-                  <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-                </el-select>
-                <el-input v-model="noticeInfo.labCodeName" type="hidden" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="文件编号">
-                <el-input v-model="noticeInfo.noticeNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="文件名称">
-                <el-input v-model="noticeInfo.noticeName" :disabled="true" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="24">
-            <el-col :span="6">
-              <el-form-item label="委托方" prop="deptId">
-                <el-input v-model="noticeInfo.customerId" type="hidden" />
-                <el-input v-model="noticeInfo.deptId" type="hidden" />
-                <el-input v-model="noticeInfo.customerName" placeholder="请选择委托单位" :disabled="true">
-                  <template #append>
-                    <el-button size="small" :disabled="type === 'detail'" @click="showCustomerFilter">
-                      选择
-                    </el-button>
-                  </template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="要求寄回时间" prop="returnDate">
-                <el-date-picker
-                  v-model="noticeInfo.returnDate" type="date"
-                  format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                  placeholder="请选择寄回时间" :clearable="true" :disabled="type === 'detail'"
-                  style="width: 100%;"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="创建人">
-                <el-input v-model="noticeInfo.noticeName" type="hidden" />
-                <el-input v-model="noticeInfo.createUserId" type="hidden" />
-                <el-input v-model="noticeInfo.createUserName" :disabled="true" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="创建时间">
-                <el-input v-model="noticeInfo.createTime" :disabled="true" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
       </detail-page>
+      <detail-block v-if="current === 'notice-basic'" title="">
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="实验室" prop="labCode">
+              <el-select v-model="noticeInfo.labCode" placeholder="请选择实验室" :disabled="keyFieldsDisable" style="width: 100%;">
+                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="部门" prop="groupCode">
+              <el-select v-model="noticeInfo.groupCode" placeholder="请选择部门" :disabled="keyFieldsDisable" style="width: 100%;">
+                <el-option v-for="dict in groupCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-      <template v-if="current === 'notice-basic'">
+          <el-col :span="6">
+            <el-form-item label="文件编号">
+              <el-input v-model="noticeInfo.noticeNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="文件名称">
+              <el-input v-model="noticeInfo.noticeName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="委托方" prop="deptId">
+              <el-input v-model="noticeInfo.customerId" type="hidden" />
+              <el-input v-model="noticeInfo.deptId" type="hidden" />
+              <el-input v-model="noticeInfo.customerName" placeholder="请选择委托单位" :disabled="true">
+                <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showCustomerFilter">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="要求寄回时间" prop="returnDate">
+              <el-date-picker
+                v-model="noticeInfo.returnDate" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择寄回时间" :clearable="true" :disabled="type === 'detail'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model="noticeInfo.noticeName" type="hidden" />
+              <el-input v-model="noticeInfo.createUserId" type="hidden" />
+              <el-input v-model="noticeInfo.createUserName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model="noticeInfo.createTime" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </detail-block>
+      <detail-block v-if="current === 'notice-basic'" title="">
         <table-container title="复查设备清单">
           <template v-if="type !== 'detail'" #btns-right>
             <el-button type="primary" @click="addEditableRow()">
@@ -776,7 +793,7 @@
             </el-table-column>
           </el-table>
         </table-container>
-      </template>
+      </detail-block>
     </el-form>
 
     <approval-dialog
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index bc911df..6f43b58 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -443,7 +443,7 @@
         <el-button v-if="approvalStatusName !== '已审批' && type === 'detail' && approvalStatusName === '未通过' && showRefuseEditButton" type="primary" @click="editForm">
           编辑
         </el-button>
-        <el-button v-if="type !== 'detail'" :disabled="!showSubmitButton" type="primary" @click="saveForm">
+        <el-button v-if="type !== 'detail'" :disabled="type === 'add' && id !== ''" type="primary" @click="saveForm">
           保存
         </el-button>
         <el-button v-if="approvalStatusName === '已取消'" type="danger" @click="del">