diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 95f718d..cfa3d77 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -9,6 +9,7 @@
 import templateDetailFourth from '@/views/business/measure/item/components/fourth/templateDetail.vue'
 import templateDetailFifth from '@/views/business/measure/item/components/fifth/templateDetail.vue'
 import templateDetailEighth from '@/views/business/measure/item/components/eighth/templateDetail.vue'
+import templateDetailThirteenth from '@/views/business/measure/item/components/thirteenth/templateDetail.vue'
 
 const props = defineProps({
   pageType: { // 页面类型
@@ -41,6 +42,9 @@
   else if (belongStandardEquipment === '8') { // 第8套：E2等砝码
     list = response.measureItemDataETwoList // 检定项表格
   }
+  else if (belongStandardEquipment === '13') { // 第13套：示波器
+    list = response.measureItemDataOscilloscopeList // 检定项表格
+  }
   return list
 }
 
@@ -97,6 +101,20 @@
                 item.partialLoadError = res.data.partialLoadError// 偏载误差
                 item.repeatability = res.data.repeatability // 重复性
               }
+              else if (item.belongStandardEquipment === '13') { // 示波器
+                item.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能性检查
+                item.timeBase = res.data.timeBase //	时基(示波器-数字)
+                item.scanTimeCoefficient = res.data.scanTimeCoefficient // 扫描时间系数及扩展(示波器-模拟)
+                item.bandWidth = res.data.bandWidth // 频带宽度(示波器-数字/模拟)
+                item.calibratingSignal = res.data.calibratingSignal //	校准信号(示波器-数字/模拟)
+                item.currentBias = res.data.currentBias //	直流偏置(示波器-数字)
+                item.currentGain = res.data.currentGain //	直流增益(示波器-数字)
+                item.inputResistance = res.data.inputResistance //	输入电阻(示波器-数字/模拟)
+                item.riseTime = res.data.riseTime //	上升时间(示波器-数字/模拟)
+                item.triggerCharacter = res.data.triggerCharacter //	触发特性(示波器-模拟)
+                item.triggerSensitivity = res.data.triggerSensitivity //	触发灵敏度(示波器-数字)
+                item.verticalAmplitude = res.data.verticalAmplitude // 垂直幅度(示波器-模拟)
+              }
               item.itemRemark = res.data.itemRemark // 检定项备注
               loading.close()
             })
@@ -217,6 +235,29 @@
         page-type="detail"
       />
 
+      <!-- 第13套: 示波器检定装置--字典：13 -->
+      <template-detail-thirteenth
+        v-if="item.belongStandardEquipment === '13'"
+        :item-category-name="item.itemCategoryName"
+        :belong-standard-equipment="item.belongStandardEquipment"
+        :list="item.detailList"
+        :form="{
+          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          timeBase: item.timeBase, //	时基(示波器-数字)
+          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+          currentBias: item.currentBias, //	直流偏置(示波器-数字)
+          currentGain: item.currentGain, //	直流增益(示波器-数字)
+          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+        }"
+        page-type="detail"
+      />
+
       <!-- 检定项备注 -->
       <el-form
         :model="item"

diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 95f718d..cfa3d77 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -9,6 +9,7 @@
 import templateDetailFourth from '@/views/business/measure/item/components/fourth/templateDetail.vue'
 import templateDetailFifth from '@/views/business/measure/item/components/fifth/templateDetail.vue'
 import templateDetailEighth from '@/views/business/measure/item/components/eighth/templateDetail.vue'
+import templateDetailThirteenth from '@/views/business/measure/item/components/thirteenth/templateDetail.vue'
 
 const props = defineProps({
   pageType: { // 页面类型
@@ -41,6 +42,9 @@
   else if (belongStandardEquipment === '8') { // 第8套：E2等砝码
     list = response.measureItemDataETwoList // 检定项表格
   }
+  else if (belongStandardEquipment === '13') { // 第13套：示波器
+    list = response.measureItemDataOscilloscopeList // 检定项表格
+  }
   return list
 }
 
@@ -97,6 +101,20 @@
                 item.partialLoadError = res.data.partialLoadError// 偏载误差
                 item.repeatability = res.data.repeatability // 重复性
               }
+              else if (item.belongStandardEquipment === '13') { // 示波器
+                item.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能性检查
+                item.timeBase = res.data.timeBase //	时基(示波器-数字)
+                item.scanTimeCoefficient = res.data.scanTimeCoefficient // 扫描时间系数及扩展(示波器-模拟)
+                item.bandWidth = res.data.bandWidth // 频带宽度(示波器-数字/模拟)
+                item.calibratingSignal = res.data.calibratingSignal //	校准信号(示波器-数字/模拟)
+                item.currentBias = res.data.currentBias //	直流偏置(示波器-数字)
+                item.currentGain = res.data.currentGain //	直流增益(示波器-数字)
+                item.inputResistance = res.data.inputResistance //	输入电阻(示波器-数字/模拟)
+                item.riseTime = res.data.riseTime //	上升时间(示波器-数字/模拟)
+                item.triggerCharacter = res.data.triggerCharacter //	触发特性(示波器-模拟)
+                item.triggerSensitivity = res.data.triggerSensitivity //	触发灵敏度(示波器-数字)
+                item.verticalAmplitude = res.data.verticalAmplitude // 垂直幅度(示波器-模拟)
+              }
               item.itemRemark = res.data.itemRemark // 检定项备注
               loading.close()
             })
@@ -217,6 +235,29 @@
         page-type="detail"
       />
 
+      <!-- 第13套: 示波器检定装置--字典：13 -->
+      <template-detail-thirteenth
+        v-if="item.belongStandardEquipment === '13'"
+        :item-category-name="item.itemCategoryName"
+        :belong-standard-equipment="item.belongStandardEquipment"
+        :list="item.detailList"
+        :form="{
+          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          timeBase: item.timeBase, //	时基(示波器-数字)
+          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+          currentBias: item.currentBias, //	直流偏置(示波器-数字)
+          currentGain: item.currentGain, //	直流增益(示波器-数字)
+          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+        }"
+        page-type="detail"
+      />
+
       <!-- 检定项备注 -->
       <el-form
         :model="item"
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 3a8adea..4fa77ff 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -38,8 +38,8 @@
   belongStandardEquipmentName: '', // 标准装置名称
 
   methodType: '', // 时基方法
-  appearance: '正常', // 外观及功能性检查
-  appearanceFunctionCheck: 1, // 外观及功能性检查
+  appearance: 1, // 外观及功能性检查
+  appearanceFunctionCheck: '正常', // 外观及功能性检查
   timeBase: 1, // 时基(示波器-数字)
   currentGain: 1, // 直流增益(示波器-数字)
   currentBias: 1, // 直流偏置(示波器-数字)
@@ -51,6 +51,8 @@
   scanTimeCoefficient: 1, // 扫描时间系数及扩展(示波器-模拟)
   triggerCharacter: 1, // 触发特性(示波器-模拟)
   verticalAmplitude: 1, // 垂直幅度(示波器-模拟)
+
+  remark: '', // 备注
 })
 // -------------------------------------------路由参数------------------------------------------
 const pageType = ref('add') // 页面类型: add, edit, detail
@@ -304,8 +306,8 @@
     itemFormData.value.itemId = res.data.itemId // 检定项id
     itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
     itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
-
+    itemFormData.value.appearanceFunctionCheck = `${res.data.appearanceFunctionCheck}` // 外观（1/0）
+    itemFormData.value.remark = res.data.remark // 结论、备注
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
@@ -822,8 +824,8 @@
     belongStandardEquipment, // 检校标准装置字典code
   }
   getItemInfo(params).then((res) => {
-    itemFormData.value.appearance = res.data.appearanceFunctionCheck ? '正常' : '' // 外观及功能检查 1有外观，2没有外观
-    itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查 1有外观，2没有外观
+    itemFormData.value.appearance = res.data.appearanceFunctionCheck // 外观及功能检查 1有外观，2没有外观
+    itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck ? '正常' : ''// 外观及功能检查 1有外观，2没有外观
     itemFormData.value.timeBase = res.data.timeBase // 时基
     itemFormData.value.currentGain = res.data.currentGain // 直流增益
     itemFormData.value.currentBias = res.data.currentBias // 直流偏置
@@ -1295,7 +1297,7 @@
       </el-radio-group>
 
       <el-form
-        v-if="current === 'measure-data' && itemFormData.appearanceFunctionCheck"
+        v-if="current === 'measure-data' && itemFormData.appearance"
         ref="formRef"
         :model="itemFormData"
         label-width="140"
@@ -1305,9 +1307,9 @@
         <el-row>
           <!-- 外观  -->
           <el-col :span="12">
-            <el-form-item label="外观及功能性检查:" prop="appearance">
+            <el-form-item label="外观及功能性检查:" prop="appearanceFunctionCheck">
               <el-input
-                v-model="itemFormData.appearance"
+                v-model="itemFormData.appearanceFunctionCheck"
                 class="full-width-input"
                 autosize
                 type="textarea"
@@ -1471,6 +1473,31 @@
       <!-- 历史修改记录 -->
       <change-record v-show="pageType === 'detail' && current === 'change-record'" :info-id="infoId" />
     </detail-block>
+
+    <!-- ------------------------------------------------结论------------------------------------------------ -->
+    <el-form
+      v-if="current === 'measure-data'"
+      ref="formRef"
+      :model="itemFormData"
+      label-width="140"
+      label-position="right"
+      style="margin-top: 20px;"
+    >
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="备注:" prop="remark">
+            <el-input
+              v-model="itemFormData.remark"
+              class="full-width-input"
+              :placeholder="pageType === 'detail' ? ' ' : '备注'"
+              autosize
+              type="textarea"
+              :disabled="pageType === 'detail'"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>