diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index 81cc0ea..8e34d5e 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -79,6 +79,8 @@
   addressCityName: '', // 公司地址-市
   addressCountryName: '', // 公司地址-国家
   addressProvinceName: '', // 公司地址-省
+
+  item: '', // 分包项项目
 })
 const fullAddress = ref<string[]>([]) // 公司地址
 const ruleFormRef = ref() // 表单ref
@@ -114,6 +116,7 @@
   traceability: [{ required: true, message: '溯源性不能为空', trigger: 'blur' }],
   testMethod: [{ required: true, message: '测试方法不能为空', trigger: 'blur' }],
   techniqueAbility: [{ required: true, message: '技术能力不能为空', trigger: 'blur' }],
+  item: [{ required: true, message: '分包项目不能为空', trigger: 'blur' }],
 })
 // -------------------------------------------文件上传--------------------------------------
 const fileRef = ref() // 文件上传input
@@ -147,7 +150,16 @@
 const outsourceReasonList = ref<dictType[]>([]) // 分包原因
 const labCodeList = ref<dictType[]>([]) // 实验室代码
 const groupCodeList = ref<dictType[]>([]) // 组别代码
-function getDict() {
+const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
+const meterIdentifyMap = ref([]) as any // 计量标识
+
+async function getDict() {
+  // 计量标识
+  const response = await getDictByCode('eqptMeterIdentify')
+  response.data.forEach((item: { value: string; name: string }) => {
+    meterIdentifyMap.value[`${item.value}`] = item.name
+  })
+  meterIdentifyDict.value = response.data
   // 实验室代码
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
@@ -157,9 +169,9 @@
     groupCodeList.value = response.data
   })
   // 分包原因
-  getDictByCode('outsourceReason').then((response) => {
-    outsourceReasonList.value = response.data
-  })
+  // getDictByCode('outsourceReason').then((response) => {
+  //   outsourceReasonList.value = response.data
+  // })
 }
 // ----------------------------------------选择分包方编号--------------------------------------
 const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
@@ -170,7 +182,6 @@
 
 // 确定选择分包方
 const confirmSelectOutsourcerNo = (val: any) => {
-  console.log(val)
   form.value.outsourcerId = val[0].id // 分包方id
   form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
@@ -191,12 +202,15 @@
 const checkoutList = ref([]) // 选中的内容
 
 const columns = ref([
-  { text: '受检设备编号', value: 'equipmentNo', align: 'center', width: '160' },
-  { text: '受检设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'model', align: 'center' },
-  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: false },
+  { text: '型号规格', value: 'model', align: 'center', required: false },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
+  { text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
   { text: '任务单编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托单位', value: 'customerName', align: 'center', width: '90' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', required: true },
+  { text: '检定有效期', value: 'certificateValid', align: 'center', required: false, width: '120' },
 ])
 
 // 多选发生改变时
@@ -220,10 +234,10 @@
 
   val.forEach((item: any) => {
     // 只添加列表里不存在的
-    const index = list.value.findIndex(
-      (i: any) => item.equipmentNo === i.equipmentNo,
-    )
+    const index = list.value.findIndex((i: any) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
+      item.meterIdentifyName = meterIdentifyMap.value[item.meterIdentify]
+      item.certificateValid = dayjs(item.certificateValid).format('YYYY-MM-DD')
       list.value.push(item)
     }
   })
@@ -255,7 +269,13 @@
   getInfo({ id: infoId.value }).then((res) => {
     // loading.value = false
     form.value = res.data
-    list.value = res.data.equipmentList
+    list.value = res.data.equipmentList.map((item: { meterIdentify: string; validate: string }) => {
+      return {
+        ...item,
+        meterIdentifyName: meterIdentifyMap.value[item.meterIdentify],
+        certificateValid: dayjs(item.validate).format('YYYY-MM-DD'),
+      }
+    })
     getDirectoriesDetail({ id: res.data.outsourcerId }).then((response) => {
       loading.value = false
       fullAddress.value = [response.data.addressCountryName, response.data.addressProvinceName, response.data.addressCityName, response.data.addressAreaName, response.data.fullAddress]
@@ -269,6 +289,10 @@
  * @param formEl 基本信息表单ref
  */
 const saveForm = async () => {
+  if (!list.value.length) {
+    ElMessage.warning('受检设备信息不能为空')
+    return false
+  }
   await ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
       // 基本信息表单通过校验
@@ -378,16 +402,17 @@
 )
 
 onMounted(async () => {
-  await getDict() // 获取字典
-  if (props.pageType !== 'add' && infoId.value) {
-    fetchInfo() // 获取详情信息
-  }
-  if (props.pageType === 'add') {
-    form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
-    form.value.applicantId = user.id // 申请人id
-    form.value.applicantName = user.name // 申请人名字
-    form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-  }
+  getDict().then(() => {
+    if (props.pageType !== 'add' && infoId.value) {
+      fetchInfo() // 获取详情信息
+    }
+    if (props.pageType === 'add') {
+      form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
+      form.value.applicantId = user.id // 申请人id
+      form.value.applicantName = user.name // 申请人名字
+      form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    }
+  })
 })
 
 defineExpose({ saveForm, submitForm })
@@ -564,7 +589,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="分包原因:" prop="outsourceReason">
             <el-select
               v-model="form.outsourceReason"
@@ -580,7 +605,7 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="预计费用(元):" prop="preCost">
             <el-input
@@ -598,6 +623,20 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="分包项目:" prop="item">
+            <el-input
+              v-model="form.item"
+              type="textarea"
+              autosize
+              :placeholder="pageType === 'detail' ? ' ' : '请输入分包项目'"
+              :disabled="pageType === 'detail'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="实验室认可情况:" prop="approveSituation">
             <el-input
               v-model="form.approveSituation"

diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index 81cc0ea..8e34d5e 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -79,6 +79,8 @@
   addressCityName: '', // 公司地址-市
   addressCountryName: '', // 公司地址-国家
   addressProvinceName: '', // 公司地址-省
+
+  item: '', // 分包项项目
 })
 const fullAddress = ref<string[]>([]) // 公司地址
 const ruleFormRef = ref() // 表单ref
@@ -114,6 +116,7 @@
   traceability: [{ required: true, message: '溯源性不能为空', trigger: 'blur' }],
   testMethod: [{ required: true, message: '测试方法不能为空', trigger: 'blur' }],
   techniqueAbility: [{ required: true, message: '技术能力不能为空', trigger: 'blur' }],
+  item: [{ required: true, message: '分包项目不能为空', trigger: 'blur' }],
 })
 // -------------------------------------------文件上传--------------------------------------
 const fileRef = ref() // 文件上传input
@@ -147,7 +150,16 @@
 const outsourceReasonList = ref<dictType[]>([]) // 分包原因
 const labCodeList = ref<dictType[]>([]) // 实验室代码
 const groupCodeList = ref<dictType[]>([]) // 组别代码
-function getDict() {
+const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
+const meterIdentifyMap = ref([]) as any // 计量标识
+
+async function getDict() {
+  // 计量标识
+  const response = await getDictByCode('eqptMeterIdentify')
+  response.data.forEach((item: { value: string; name: string }) => {
+    meterIdentifyMap.value[`${item.value}`] = item.name
+  })
+  meterIdentifyDict.value = response.data
   // 实验室代码
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
@@ -157,9 +169,9 @@
     groupCodeList.value = response.data
   })
   // 分包原因
-  getDictByCode('outsourceReason').then((response) => {
-    outsourceReasonList.value = response.data
-  })
+  // getDictByCode('outsourceReason').then((response) => {
+  //   outsourceReasonList.value = response.data
+  // })
 }
 // ----------------------------------------选择分包方编号--------------------------------------
 const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
@@ -170,7 +182,6 @@
 
 // 确定选择分包方
 const confirmSelectOutsourcerNo = (val: any) => {
-  console.log(val)
   form.value.outsourcerId = val[0].id // 分包方id
   form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
@@ -191,12 +202,15 @@
 const checkoutList = ref([]) // 选中的内容
 
 const columns = ref([
-  { text: '受检设备编号', value: 'equipmentNo', align: 'center', width: '160' },
-  { text: '受检设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'model', align: 'center' },
-  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: false },
+  { text: '型号规格', value: 'model', align: 'center', required: false },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
+  { text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
   { text: '任务单编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托单位', value: 'customerName', align: 'center', width: '90' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', required: true },
+  { text: '检定有效期', value: 'certificateValid', align: 'center', required: false, width: '120' },
 ])
 
 // 多选发生改变时
@@ -220,10 +234,10 @@
 
   val.forEach((item: any) => {
     // 只添加列表里不存在的
-    const index = list.value.findIndex(
-      (i: any) => item.equipmentNo === i.equipmentNo,
-    )
+    const index = list.value.findIndex((i: any) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
+      item.meterIdentifyName = meterIdentifyMap.value[item.meterIdentify]
+      item.certificateValid = dayjs(item.certificateValid).format('YYYY-MM-DD')
       list.value.push(item)
     }
   })
@@ -255,7 +269,13 @@
   getInfo({ id: infoId.value }).then((res) => {
     // loading.value = false
     form.value = res.data
-    list.value = res.data.equipmentList
+    list.value = res.data.equipmentList.map((item: { meterIdentify: string; validate: string }) => {
+      return {
+        ...item,
+        meterIdentifyName: meterIdentifyMap.value[item.meterIdentify],
+        certificateValid: dayjs(item.validate).format('YYYY-MM-DD'),
+      }
+    })
     getDirectoriesDetail({ id: res.data.outsourcerId }).then((response) => {
       loading.value = false
       fullAddress.value = [response.data.addressCountryName, response.data.addressProvinceName, response.data.addressCityName, response.data.addressAreaName, response.data.fullAddress]
@@ -269,6 +289,10 @@
  * @param formEl 基本信息表单ref
  */
 const saveForm = async () => {
+  if (!list.value.length) {
+    ElMessage.warning('受检设备信息不能为空')
+    return false
+  }
   await ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
       // 基本信息表单通过校验
@@ -378,16 +402,17 @@
 )
 
 onMounted(async () => {
-  await getDict() // 获取字典
-  if (props.pageType !== 'add' && infoId.value) {
-    fetchInfo() // 获取详情信息
-  }
-  if (props.pageType === 'add') {
-    form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
-    form.value.applicantId = user.id // 申请人id
-    form.value.applicantName = user.name // 申请人名字
-    form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-  }
+  getDict().then(() => {
+    if (props.pageType !== 'add' && infoId.value) {
+      fetchInfo() // 获取详情信息
+    }
+    if (props.pageType === 'add') {
+      form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
+      form.value.applicantId = user.id // 申请人id
+      form.value.applicantName = user.name // 申请人名字
+      form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    }
+  })
 })
 
 defineExpose({ saveForm, submitForm })
@@ -564,7 +589,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="分包原因:" prop="outsourceReason">
             <el-select
               v-model="form.outsourceReason"
@@ -580,7 +605,7 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="预计费用(元):" prop="preCost">
             <el-input
@@ -598,6 +623,20 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="分包项目:" prop="item">
+            <el-input
+              v-model="form.item"
+              type="textarea"
+              autosize
+              :placeholder="pageType === 'detail' ? ' ' : '请输入分包项目'"
+              :disabled="pageType === 'detail'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="实验室认可情况:" prop="approveSituation">
             <el-input
               v-model="form.approveSituation"
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index b2305cb..891350e 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -66,6 +66,8 @@
   addressCityName: string // 公司地址-市
   addressCountryName: string // 公司地址-国家
   addressProvinceName: string // 公司地址-省
+
+  item: string // 分包项目
 }
 
 // 分包方人员

diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index 81cc0ea..8e34d5e 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -79,6 +79,8 @@
   addressCityName: '', // 公司地址-市
   addressCountryName: '', // 公司地址-国家
   addressProvinceName: '', // 公司地址-省
+
+  item: '', // 分包项项目
 })
 const fullAddress = ref<string[]>([]) // 公司地址
 const ruleFormRef = ref() // 表单ref
@@ -114,6 +116,7 @@
   traceability: [{ required: true, message: '溯源性不能为空', trigger: 'blur' }],
   testMethod: [{ required: true, message: '测试方法不能为空', trigger: 'blur' }],
   techniqueAbility: [{ required: true, message: '技术能力不能为空', trigger: 'blur' }],
+  item: [{ required: true, message: '分包项目不能为空', trigger: 'blur' }],
 })
 // -------------------------------------------文件上传--------------------------------------
 const fileRef = ref() // 文件上传input
@@ -147,7 +150,16 @@
 const outsourceReasonList = ref<dictType[]>([]) // 分包原因
 const labCodeList = ref<dictType[]>([]) // 实验室代码
 const groupCodeList = ref<dictType[]>([]) // 组别代码
-function getDict() {
+const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
+const meterIdentifyMap = ref([]) as any // 计量标识
+
+async function getDict() {
+  // 计量标识
+  const response = await getDictByCode('eqptMeterIdentify')
+  response.data.forEach((item: { value: string; name: string }) => {
+    meterIdentifyMap.value[`${item.value}`] = item.name
+  })
+  meterIdentifyDict.value = response.data
   // 实验室代码
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
@@ -157,9 +169,9 @@
     groupCodeList.value = response.data
   })
   // 分包原因
-  getDictByCode('outsourceReason').then((response) => {
-    outsourceReasonList.value = response.data
-  })
+  // getDictByCode('outsourceReason').then((response) => {
+  //   outsourceReasonList.value = response.data
+  // })
 }
 // ----------------------------------------选择分包方编号--------------------------------------
 const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
@@ -170,7 +182,6 @@
 
 // 确定选择分包方
 const confirmSelectOutsourcerNo = (val: any) => {
-  console.log(val)
   form.value.outsourcerId = val[0].id // 分包方id
   form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
@@ -191,12 +202,15 @@
 const checkoutList = ref([]) // 选中的内容
 
 const columns = ref([
-  { text: '受检设备编号', value: 'equipmentNo', align: 'center', width: '160' },
-  { text: '受检设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'model', align: 'center' },
-  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: false },
+  { text: '型号规格', value: 'model', align: 'center', required: false },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
+  { text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
   { text: '任务单编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托单位', value: 'customerName', align: 'center', width: '90' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', required: true },
+  { text: '检定有效期', value: 'certificateValid', align: 'center', required: false, width: '120' },
 ])
 
 // 多选发生改变时
@@ -220,10 +234,10 @@
 
   val.forEach((item: any) => {
     // 只添加列表里不存在的
-    const index = list.value.findIndex(
-      (i: any) => item.equipmentNo === i.equipmentNo,
-    )
+    const index = list.value.findIndex((i: any) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
+      item.meterIdentifyName = meterIdentifyMap.value[item.meterIdentify]
+      item.certificateValid = dayjs(item.certificateValid).format('YYYY-MM-DD')
       list.value.push(item)
     }
   })
@@ -255,7 +269,13 @@
   getInfo({ id: infoId.value }).then((res) => {
     // loading.value = false
     form.value = res.data
-    list.value = res.data.equipmentList
+    list.value = res.data.equipmentList.map((item: { meterIdentify: string; validate: string }) => {
+      return {
+        ...item,
+        meterIdentifyName: meterIdentifyMap.value[item.meterIdentify],
+        certificateValid: dayjs(item.validate).format('YYYY-MM-DD'),
+      }
+    })
     getDirectoriesDetail({ id: res.data.outsourcerId }).then((response) => {
       loading.value = false
       fullAddress.value = [response.data.addressCountryName, response.data.addressProvinceName, response.data.addressCityName, response.data.addressAreaName, response.data.fullAddress]
@@ -269,6 +289,10 @@
  * @param formEl 基本信息表单ref
  */
 const saveForm = async () => {
+  if (!list.value.length) {
+    ElMessage.warning('受检设备信息不能为空')
+    return false
+  }
   await ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
       // 基本信息表单通过校验
@@ -378,16 +402,17 @@
 )
 
 onMounted(async () => {
-  await getDict() // 获取字典
-  if (props.pageType !== 'add' && infoId.value) {
-    fetchInfo() // 获取详情信息
-  }
-  if (props.pageType === 'add') {
-    form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
-    form.value.applicantId = user.id // 申请人id
-    form.value.applicantName = user.name // 申请人名字
-    form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-  }
+  getDict().then(() => {
+    if (props.pageType !== 'add' && infoId.value) {
+      fetchInfo() // 获取详情信息
+    }
+    if (props.pageType === 'add') {
+      form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
+      form.value.applicantId = user.id // 申请人id
+      form.value.applicantName = user.name // 申请人名字
+      form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    }
+  })
 })
 
 defineExpose({ saveForm, submitForm })
@@ -564,7 +589,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="分包原因:" prop="outsourceReason">
             <el-select
               v-model="form.outsourceReason"
@@ -580,7 +605,7 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="预计费用(元):" prop="preCost">
             <el-input
@@ -598,6 +623,20 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="分包项目:" prop="item">
+            <el-input
+              v-model="form.item"
+              type="textarea"
+              autosize
+              :placeholder="pageType === 'detail' ? ' ' : '请输入分包项目'"
+              :disabled="pageType === 'detail'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="实验室认可情况:" prop="approveSituation">
             <el-input
               v-model="form.approveSituation"
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index b2305cb..891350e 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -66,6 +66,8 @@
   addressCityName: string // 公司地址-市
   addressCountryName: string // 公司地址-国家
   addressProvinceName: string // 公司地址-省
+
+  item: string // 分包项目
 }
 
 // 分包方人员
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts b/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts
index e8e8f6f..ac55198 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts
@@ -22,25 +22,25 @@
 
   ptOne: string //		实验载荷Pt1
   ptOneUnit: string //		实验载荷Pt1单位
-  aequipmentId: string // 载荷点A设备id
-  adeviceNumber: number // 载荷点A器号
-  anominalQualityValue: number // 载荷点A标称质量值(单位固定g，不存单位)
-  aconvertQualityCorrectValue: number // 载荷点A折算质量修正值(单位固定mg，不存单位)
-  amanufactureNo: string // 载荷点A出厂编号
+  aEquipmentId: string // 载荷点A设备id
+  aDeviceNumber: undefined // 载荷点A器号
+  aNominalQualityValue: undefined // 载荷点A标称质量值(单位固定g，不存单位)
+  aConvertQualityCorrectValue: undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+  aManufactureNo: string // 载荷点A出厂编号
 
-  bequipmentId: string // 载荷点B设备id
-  bdeviceNumber: string // 载荷点B器号
-  bnominalQualityValue: string // 载荷点B标称质量值(单位固定g，不存单位)
-  bconvertQualityCorrectValue: string // 载荷点B折算质量修正值(单位固定mg，不存单位)
-  bmanufactureNo: string // 载荷点B出厂编号
+  bEquipmentId: string // 载荷点B设备id
+  bDeviceNumber: undefined // 载荷点B器号
+  bNominalQualityValue: undefined // 载荷点B标称质量值(单位固定g，不存单位)
+  bConvertQualityCorrectValue: undefined// 载荷点B折算质量修正值(单位固定mg，不存单位)
+  bManufactureNo: string // 载荷点B出厂编号
 
   ptTwo: string // 实验载荷Pt2
   ptTwoUnit: string // 实验载荷Pt2单位
 
   scalePlateForm: string // 秤量盘形式
-  mSValue: string // 标准小砝码ms
-  mpesValue: string // |MPEs|
-  uBValue: string // Ub
+  mSValue: undefined // 标准小砝码ms
+  mpesValue: undefined // |MPEs|
+  uBValue: undefined // Ub
 
   actualDivisionValue: string //		实际分度值d，该参数在结果处理表中每行都要传
   actualDivisionValueUnit: string //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传

diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index 81cc0ea..8e34d5e 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -79,6 +79,8 @@
   addressCityName: '', // 公司地址-市
   addressCountryName: '', // 公司地址-国家
   addressProvinceName: '', // 公司地址-省
+
+  item: '', // 分包项项目
 })
 const fullAddress = ref<string[]>([]) // 公司地址
 const ruleFormRef = ref() // 表单ref
@@ -114,6 +116,7 @@
   traceability: [{ required: true, message: '溯源性不能为空', trigger: 'blur' }],
   testMethod: [{ required: true, message: '测试方法不能为空', trigger: 'blur' }],
   techniqueAbility: [{ required: true, message: '技术能力不能为空', trigger: 'blur' }],
+  item: [{ required: true, message: '分包项目不能为空', trigger: 'blur' }],
 })
 // -------------------------------------------文件上传--------------------------------------
 const fileRef = ref() // 文件上传input
@@ -147,7 +150,16 @@
 const outsourceReasonList = ref<dictType[]>([]) // 分包原因
 const labCodeList = ref<dictType[]>([]) // 实验室代码
 const groupCodeList = ref<dictType[]>([]) // 组别代码
-function getDict() {
+const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
+const meterIdentifyMap = ref([]) as any // 计量标识
+
+async function getDict() {
+  // 计量标识
+  const response = await getDictByCode('eqptMeterIdentify')
+  response.data.forEach((item: { value: string; name: string }) => {
+    meterIdentifyMap.value[`${item.value}`] = item.name
+  })
+  meterIdentifyDict.value = response.data
   // 实验室代码
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
@@ -157,9 +169,9 @@
     groupCodeList.value = response.data
   })
   // 分包原因
-  getDictByCode('outsourceReason').then((response) => {
-    outsourceReasonList.value = response.data
-  })
+  // getDictByCode('outsourceReason').then((response) => {
+  //   outsourceReasonList.value = response.data
+  // })
 }
 // ----------------------------------------选择分包方编号--------------------------------------
 const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
@@ -170,7 +182,6 @@
 
 // 确定选择分包方
 const confirmSelectOutsourcerNo = (val: any) => {
-  console.log(val)
   form.value.outsourcerId = val[0].id // 分包方id
   form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
@@ -191,12 +202,15 @@
 const checkoutList = ref([]) // 选中的内容
 
 const columns = ref([
-  { text: '受检设备编号', value: 'equipmentNo', align: 'center', width: '160' },
-  { text: '受检设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'model', align: 'center' },
-  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: false },
+  { text: '型号规格', value: 'model', align: 'center', required: false },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
+  { text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
   { text: '任务单编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托单位', value: 'customerName', align: 'center', width: '90' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', required: true },
+  { text: '检定有效期', value: 'certificateValid', align: 'center', required: false, width: '120' },
 ])
 
 // 多选发生改变时
@@ -220,10 +234,10 @@
 
   val.forEach((item: any) => {
     // 只添加列表里不存在的
-    const index = list.value.findIndex(
-      (i: any) => item.equipmentNo === i.equipmentNo,
-    )
+    const index = list.value.findIndex((i: any) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
+      item.meterIdentifyName = meterIdentifyMap.value[item.meterIdentify]
+      item.certificateValid = dayjs(item.certificateValid).format('YYYY-MM-DD')
       list.value.push(item)
     }
   })
@@ -255,7 +269,13 @@
   getInfo({ id: infoId.value }).then((res) => {
     // loading.value = false
     form.value = res.data
-    list.value = res.data.equipmentList
+    list.value = res.data.equipmentList.map((item: { meterIdentify: string; validate: string }) => {
+      return {
+        ...item,
+        meterIdentifyName: meterIdentifyMap.value[item.meterIdentify],
+        certificateValid: dayjs(item.validate).format('YYYY-MM-DD'),
+      }
+    })
     getDirectoriesDetail({ id: res.data.outsourcerId }).then((response) => {
       loading.value = false
       fullAddress.value = [response.data.addressCountryName, response.data.addressProvinceName, response.data.addressCityName, response.data.addressAreaName, response.data.fullAddress]
@@ -269,6 +289,10 @@
  * @param formEl 基本信息表单ref
  */
 const saveForm = async () => {
+  if (!list.value.length) {
+    ElMessage.warning('受检设备信息不能为空')
+    return false
+  }
   await ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
       // 基本信息表单通过校验
@@ -378,16 +402,17 @@
 )
 
 onMounted(async () => {
-  await getDict() // 获取字典
-  if (props.pageType !== 'add' && infoId.value) {
-    fetchInfo() // 获取详情信息
-  }
-  if (props.pageType === 'add') {
-    form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
-    form.value.applicantId = user.id // 申请人id
-    form.value.applicantName = user.name // 申请人名字
-    form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-  }
+  getDict().then(() => {
+    if (props.pageType !== 'add' && infoId.value) {
+      fetchInfo() // 获取详情信息
+    }
+    if (props.pageType === 'add') {
+      form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
+      form.value.applicantId = user.id // 申请人id
+      form.value.applicantName = user.name // 申请人名字
+      form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    }
+  })
 })
 
 defineExpose({ saveForm, submitForm })
@@ -564,7 +589,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="分包原因:" prop="outsourceReason">
             <el-select
               v-model="form.outsourceReason"
@@ -580,7 +605,7 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="预计费用(元):" prop="preCost">
             <el-input
@@ -598,6 +623,20 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="分包项目:" prop="item">
+            <el-input
+              v-model="form.item"
+              type="textarea"
+              autosize
+              :placeholder="pageType === 'detail' ? ' ' : '请输入分包项目'"
+              :disabled="pageType === 'detail'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="实验室认可情况:" prop="approveSituation">
             <el-input
               v-model="form.approveSituation"
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index b2305cb..891350e 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -66,6 +66,8 @@
   addressCityName: string // 公司地址-市
   addressCountryName: string // 公司地址-国家
   addressProvinceName: string // 公司地址-省
+
+  item: string // 分包项目
 }
 
 // 分包方人员
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts b/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts
index e8e8f6f..ac55198 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts
@@ -22,25 +22,25 @@
 
   ptOne: string //		实验载荷Pt1
   ptOneUnit: string //		实验载荷Pt1单位
-  aequipmentId: string // 载荷点A设备id
-  adeviceNumber: number // 载荷点A器号
-  anominalQualityValue: number // 载荷点A标称质量值(单位固定g，不存单位)
-  aconvertQualityCorrectValue: number // 载荷点A折算质量修正值(单位固定mg，不存单位)
-  amanufactureNo: string // 载荷点A出厂编号
+  aEquipmentId: string // 载荷点A设备id
+  aDeviceNumber: undefined // 载荷点A器号
+  aNominalQualityValue: undefined // 载荷点A标称质量值(单位固定g，不存单位)
+  aConvertQualityCorrectValue: undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+  aManufactureNo: string // 载荷点A出厂编号
 
-  bequipmentId: string // 载荷点B设备id
-  bdeviceNumber: string // 载荷点B器号
-  bnominalQualityValue: string // 载荷点B标称质量值(单位固定g，不存单位)
-  bconvertQualityCorrectValue: string // 载荷点B折算质量修正值(单位固定mg，不存单位)
-  bmanufactureNo: string // 载荷点B出厂编号
+  bEquipmentId: string // 载荷点B设备id
+  bDeviceNumber: undefined // 载荷点B器号
+  bNominalQualityValue: undefined // 载荷点B标称质量值(单位固定g，不存单位)
+  bConvertQualityCorrectValue: undefined// 载荷点B折算质量修正值(单位固定mg，不存单位)
+  bManufactureNo: string // 载荷点B出厂编号
 
   ptTwo: string // 实验载荷Pt2
   ptTwoUnit: string // 实验载荷Pt2单位
 
   scalePlateForm: string // 秤量盘形式
-  mSValue: string // 标准小砝码ms
-  mpesValue: string // |MPEs|
-  uBValue: string // Ub
+  mSValue: undefined // 标准小砝码ms
+  mpesValue: undefined // |MPEs|
+  uBValue: undefined // Ub
 
   actualDivisionValue: string //		实际分度值d，该参数在结果处理表中每行都要传
   actualDivisionValueUnit: string //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index 542acfa..017127d 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -98,11 +98,6 @@
   aNominalQualityValue_5: undefined, // 载荷点A标称质量值(单位固定g，不存单位)
   aConvertQualityCorrectValue_5: undefined, // 载荷点A折算质量修正值(单位固定mg，不存单位)
   aManufactureNo_5: '', // 载荷点A出厂编号
-  bEquipmentId_5: '', // 载荷点B设备id
-  bDeviceNumber_5: undefined, // 载荷点B器号
-  bNominalQualityValue_5: undefined, // 载荷点B标称质量值(单位固定g，不存单位)
-  bConvertQualityCorrectValue_5: undefined, // 载荷点B折算质量修正值(单位固定mg，不存单位)
-  bManufactureNo_5: '', // 载荷点B出厂编号
   mSValue_5: undefined, // 标准小砝码ms
   mpesValue_5: undefined, //		|MPEs|
   uBValue: undefined, // Ub
@@ -267,7 +262,7 @@
   { text: 'A(mr2) / g', value: 'aTwo', align: 'center', required: true, width: '180' },
   { text: '△m<sub>i</sub> / mg', value: 'deltaM', align: 'center', required: false },
   { text: '△m均值 / mg', value: 'deltaMAverage', align: 'center', required: false },
-  { text: 'm<sub>s</sub> - △m均值/mg', value: 'mreduceDeltaM', align: 'center', required: false },
+  { text: 'm<sub>s</sub> - △m均值/mg', value: 'mReduceDeltaM', align: 'center', required: false },
   { text: 'U<sub>S</sub> / mg', value: 'uSValue', align: 'center', required: false },
 ])
 // -------------------------------------------获取详情信息--------------------------------------------------
@@ -294,90 +289,190 @@
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
+    if (res && res.data && res.data.measureDataETwoList.length) {
+      itemFormData.value.remark = res.data.remark // 结论、备注
+      const responseList = res.data.measureDataETwoList.map((item: IDetailMeasureList) => {
+        return {
+          ...item,
+          aOne: `${item.aOne}` === '' ? undefined : item.aOne,
+          bOne: `${item.bOne}` === '' ? undefined : item.bOne,
+          bTwo: `${item.bTwo}` === '' ? undefined : item.bTwo,
+          aTwo: `${item.aTwo}` === '' ? undefined : item.aTwo,
+        }
+      })
+      repeatabilityPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '1' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '重复性' } })
+      repeatabilityPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '1' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '重复性' } })
+      offsetErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } })
+      offsetErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } })
+      indicationErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } })
+      indicationErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } })
+      if (repeatabilityPt1List.value.length) {
+        itemFormData.value.aEquipmentId_1 = repeatabilityPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1
+        itemFormData.value.aDeviceNumber_1 = repeatabilityPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_1 = repeatabilityPt1List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_1 = repeatabilityPt1List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_1 = repeatabilityPt1List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.bEquipmentId_1 = repeatabilityPt1List.value[0].bEquipmentId || '' // 载荷点B设备id
+        itemFormData.value.bDeviceNumber_1 = repeatabilityPt1List.value[0].bDeviceNumber || undefined // 载荷点B器号
+        itemFormData.value.bNominalQualityValue_1 = repeatabilityPt1List.value[0].bNominalQualityValue || undefined // 载荷点B标称质量值(单位固定g，不存单位)
+        itemFormData.value.bConvertQualityCorrectValue_1 = repeatabilityPt1List.value[0].bConvertQualityCorrectValue || undefined // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.bManufactureNo_1 = repeatabilityPt1List.value[0].bManufactureNo || '' // 载荷点B出厂编号
+      }
+      if (repeatabilityPt2List.value.length) {
+        // 重复性-实验载荷Pt2
+        itemFormData.value.aEquipmentId_2 = repeatabilityPt2List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1
+        itemFormData.value.aDeviceNumber_2 = repeatabilityPt2List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_2 = repeatabilityPt2List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_2 = repeatabilityPt2List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_2 = repeatabilityPt2List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.bEquipmentId_2 = repeatabilityPt2List.value[0].bEquipmentId || '' // 载荷点B设备id
+        itemFormData.value.bDeviceNumber_2 = repeatabilityPt2List.value[0].bDeviceNumber || undefined // 载荷点B器号
+        itemFormData.value.bNominalQualityValue_2 = repeatabilityPt2List.value[0].bNominalQualityValue || undefined // 载荷点B标称质量值(单位固定g，不存单位)
+        itemFormData.value.bConvertQualityCorrectValue_2 = repeatabilityPt2List.value[0].bConvertQualityCorrectValue || undefined // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.bManufactureNo_2 = repeatabilityPt2List.value[0].bManufactureNo || '' // 载荷点B出厂编号
+      }
 
-    // list.value = res.data.measureDataPistonGaugeList.map((item: IDetailMeasureList) => {
-    //   return {
-    //     ...item,
-    //     editable: pageType.value !== 'detail',
-    //   }
-    // }) // 检定数据
+      if (offsetErrorPt1List.value.length) {
+        // 重复性-实验载荷Pt2
+        itemFormData.value.aEquipmentId_3 = offsetErrorPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1
+        itemFormData.value.aDeviceNumber_3 = offsetErrorPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_3 = offsetErrorPt1List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_3 = offsetErrorPt1List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_3 = offsetErrorPt1List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.bEquipmentId_3 = offsetErrorPt1List.value[0].bEquipmentId || '' // 载荷点B设备id
+        itemFormData.value.bDeviceNumber_3 = offsetErrorPt1List.value[0].bDeviceNumber || undefined // 载荷点B器号
+        itemFormData.value.bNominalQualityValue_3 = offsetErrorPt1List.value[0].bNominalQualityValue || undefined // 载荷点B标称质量值(单位固定g，不存单位)
+        itemFormData.value.bConvertQualityCorrectValue_3 = offsetErrorPt1List.value[0].bConvertQualityCorrectValue || undefined // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.bManufactureNo_3 = offsetErrorPt1List.value[0].bManufactureNo || '' // 载荷点B出厂编号
+        // 称量盘形式
+        itemFormData.value.scalePlateForm = offsetErrorPt1List.value[0].scalePlateForm
+      }
 
+      if (offsetErrorPt2List.value.length) {
+        // 重复性-实验载荷Pt2
+        itemFormData.value.aEquipmentId_4 = offsetErrorPt2List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1
+        itemFormData.value.aDeviceNumber_4 = offsetErrorPt2List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_4 = offsetErrorPt2List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_4 = offsetErrorPt2List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_4 = offsetErrorPt2List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.bEquipmentId_4 = offsetErrorPt2List.value[0].bEquipmentId || '' // 载荷点B设备id
+        itemFormData.value.bDeviceNumber_4 = offsetErrorPt2List.value[0].bDeviceNumber || undefined // 载荷点B器号
+        itemFormData.value.bNominalQualityValue_4 = offsetErrorPt2List.value[0].bNominalQualityValue || undefined // 载荷点B标称质量值(单位固定g，不存单位)
+        itemFormData.value.bConvertQualityCorrectValue_4 = offsetErrorPt2List.value[0].bConvertQualityCorrectValue || undefined // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.bManufactureNo_4 = offsetErrorPt2List.value[0].bManufactureNo || '' // 载荷点B出厂编号
+      }
+
+      if (indicationErrorPt1List.value.length) {
+        // 局部示值误差-实验载荷Pt1
+        itemFormData.value.aEquipmentId_5 = indicationErrorPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 2表示第一个表格即重复性实验载荷Pt2
+        itemFormData.value.aDeviceNumber_5 = indicationErrorPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_5 = indicationErrorPt1List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_5 = indicationErrorPt1List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_5 = indicationErrorPt1List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.mSValue_5 = indicationErrorPt1List.value[0].mSValue || undefined // 标准小砝码ms
+        itemFormData.value.mpesValue_5 = indicationErrorPt1List.value[0].mpesValue || undefined //		|MPEs|
+        itemFormData.value.uBValue = indicationErrorPt1List.value[0].uBValue || undefined // Ub
+      }
+
+      if (indicationErrorPt2List.value.length) {
+        // 局部示值误差-实验载荷Pt2
+        itemFormData.value.aEquipmentId_6 = indicationErrorPt2List.value[0].aEquipmentId || '' // 载荷点A设备id 2表示第一个表格即重复性实验载荷Pt2
+        itemFormData.value.aDeviceNumber_6 = indicationErrorPt2List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_6 = indicationErrorPt2List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_6 = indicationErrorPt2List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_6 = indicationErrorPt2List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.mSValue_6 = indicationErrorPt2List.value[0].mSValue || undefined // 标准小砝码ms
+        itemFormData.value.mpesValue_6 = indicationErrorPt2List.value[0].mpesValue || undefined //		|MPEs|
+      }
+    }
     infoId.value = res.data.id
     emits('giveInfoId', infoId.value)
     loading.close()
   })
 }
-// 初始化输入数据
-const initInputData = (data: any) => {
+/**
+ * 初始化输入数据
+ * @param data 要处理的数据
+ * @param solveList 是否处理表格数据
+ */
+const initInputData = (data: any, solveList = true) => {
   itemFormData.value.ptOne = data[0].ptOne //	实验载荷Pt1
   itemFormData.value.ptOneUnit = data[0].ptOneUnit // 实验载荷Pt1单位
   itemFormData.value.ptTwo = data[0].ptTwo // 实验载荷Pt2
   itemFormData.value.ptTwoUnit = data[0].ptTwoUnit// 实验载荷Pt2单位
   itemFormData.value.actualDivisionValue = data[0].actualDivisionValue //	实际分度值d，该参数在结果处理表中每行都要传
   itemFormData.value.actualDivisionValueUnit = data[0].actualDivisionValueUnit // 实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
-  // 清空数据
-  repeatabilityPt1List.value = [] // 重复性表格Pt1
-  repeatabilityPt2List.value = [] // 重复性表格Pt2
-  offsetErrorPt1List.value = [] // 偏载误差Pt1
-  offsetErrorPt2List.value = [] // 偏载误差Pt2
-  indicationErrorPt1List.value = [] // 局部示值误差Pt1
-  indicationErrorPt2List.value = [] // 局部示值误差Pt2
-  // 重复性表格Pt1、Pt2
-  for (let i = 1; i <= 10; i++) {
-    repeatabilityPt1List.value.push({
-      ...data[0],
-      params: '重复性',
-      measureSequence: i,
-      dataType: '1',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-    repeatabilityPt2List.value.push({
-      ...data[0],
-      params: '重复性',
-      measureSequence: i,
-      dataType: '1',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-  }
-  // 偏载误差
-  for (let i = 1; i <= 4; i++) {
-    offsetErrorPt1List.value.push({
-      ...data[0],
-      params: '偏载误差',
-      measureSequence: i === 1 ? '前' : i === 2 ? '后' : i === 3 ? '左' : '右',
-      dataType: '2',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-    offsetErrorPt2List.value.push({
-      ...data[0],
-      params: '偏载误差',
-      measureSequence: i === 1 ? '前' : i === 2 ? '后' : i === 3 ? '左' : '右',
-      dataType: '2',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-  }
-  // 局部示值误差
-  for (let i = 1; i <= 3; i++) {
-    indicationErrorPt1List.value.push({
-      ...data[0],
-      params: '局部示值误差',
-      measureSequence: i,
-      dataType: '3',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-    indicationErrorPt2List.value.push({
-      ...data[0],
-      params: '局部示值误差',
-      measureSequence: i,
-      dataType: '3',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
+  if (solveList) {
+    // 清空数据
+    repeatabilityPt1List.value = [] // 重复性表格Pt1
+    repeatabilityPt2List.value = [] // 重复性表格Pt2
+    offsetErrorPt1List.value = [] // 偏载误差Pt1
+    offsetErrorPt2List.value = [] // 偏载误差Pt2
+    indicationErrorPt1List.value = [] // 局部示值误差Pt1
+    indicationErrorPt2List.value = [] // 局部示值误差Pt2
+    // 重复性表格Pt1、Pt2
+    for (let i = 1; i <= 10; i++) {
+      repeatabilityPt1List.value.push({
+        ...data[0],
+        params: '重复性',
+        measureSequence: i,
+        dataType: '1',
+        id: '',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+      })
+      repeatabilityPt2List.value.push({
+        ...data[0],
+        params: '重复性',
+        measureSequence: i,
+        dataType: '1',
+        id: '',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+      })
+    }
+    // 偏载误差
+    for (let i = 1; i <= 4; i++) {
+      offsetErrorPt1List.value.push({
+        ...data[0],
+        params: '偏载误差',
+        measureSequence: i === 1 ? '前' : i === 2 ? '后' : i === 3 ? '左' : '右',
+        id: '',
+        dataType: '2',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+      })
+      offsetErrorPt2List.value.push({
+        ...data[0],
+        params: '偏载误差',
+        measureSequence: i === 1 ? '前' : i === 2 ? '后' : i === 3 ? '左' : '右',
+        id: '',
+        dataType: '2',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+      })
+    }
+    // 局部示值误差
+    for (let i = 1; i <= 3; i++) {
+      indicationErrorPt1List.value.push({
+        ...data[0],
+        params: '局部示值误差',
+        measureSequence: i,
+        dataType: '3',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+        id: '',
+      })
+      indicationErrorPt2List.value.push({
+        ...data[0],
+        params: '局部示值误差',
+        measureSequence: i,
+        dataType: '3',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+        id: '',
+      })
+    }
   }
 }
 
@@ -386,8 +481,9 @@
  * @param itemId  检定项id
  * @param itemCategoryName 检定项分类名字
  * @param belongStandardEquipment 检校标准装置字典
+ * @param solveList 是否处理表格
  */
-const fetchItemInfo = (itemId: string, itemCategoryName: string, belongStandardEquipment = '') => {
+const fetchItemInfo = (itemId: string, itemCategoryName: string, belongStandardEquipment = '', solveList = true) => {
   const params = {
     id: itemId,
     itemCategoryName, // 检定项分类名字
@@ -400,12 +496,12 @@
     itemFormData.value.partialLoadError = `${res.data.partialLoadError}` === '1'// 偏载误差
     if (res.data && res.data.measureItemDataETwoList && res.data.measureItemDataETwoList.length) {
       originData.value = res.data.measureItemDataETwoList
-      initInputData(res.data.measureItemDataETwoList)
+      initInputData(res.data.measureItemDataETwoList, solveList)
     }
   })
 }
 
-// ----------------------------------------点击保存时校验---------------------------------------
+// ----------------------------------------点击计算时校验---------------------------------------
 const checkoutResult = ref(true)
 // 校验
 const checkout = async (type: string) => {
@@ -500,6 +596,11 @@
     })
   }
   if (type === '6') { // 第6个表格 局部示值误差载荷pt2
+    if (!itemFormData.value.uBValue) {
+      ElMessage.warning('请先填写局部示值误差-Pt1-Ub')
+      checkoutResult.value = false
+      return
+    }
     if (!repeatabilityPt2List.value[0].sValue) {
       ElMessage.warning('请先计算重复性-实验载荷Pt2')
       checkoutResult.value = false
@@ -520,12 +621,31 @@
     })
   }
 }
+
+// 点击保存之前处理参数
+const solveParamsBeforeSave = () => {
+  const tempRepeatabilityPt1List: any = solveParams('1', 'noLoading')// 重复性表格Pt1
+  const tempRepeatabilityPt2List: any = solveParams('2', 'noLoading')// 重复性表格Pt2
+  const tempOffsetErrorPt1List: any = solveParams('3', 'noLoading')// 偏载误差Pt1
+  const tempOffsetErrorPt2List: any = solveParams('4', 'noLoading')// 偏载误差Pt2
+  const tempIndicationErrorPt1List: any = solveParams('5', 'noLoading') // 局部示值误差Pt1
+  const tempIndicationErrorPt2List: any = solveParams('6', 'noLoading')// 局部示值误差Pt2
+  const list = [
+    ...tempRepeatabilityPt1List,
+    ...tempRepeatabilityPt2List,
+    ...tempOffsetErrorPt1List,
+    ...tempOffsetErrorPt2List,
+    ...tempIndicationErrorPt1List,
+    ...tempIndicationErrorPt2List,
+  ]
+  return list
+}
 // -----------------------------------------生成结果处理----------------------------------------
 // 处理计算入参
-const solveParams = (type: string) => {
+function solveParams(type: string, loading: string) {
   let list
   if (type === '1') { // 重复性表格Pt1
-    tableLoading_1.value = true
+    tableLoading_1.value = loading !== 'noLoading'
     list = repeatabilityPt1List.value.map((item) => {
       return {
         ...item,
@@ -539,13 +659,15 @@
         bDeviceNumber: itemFormData.value.bDeviceNumber_1, // 载荷点B器号
         bNominalQualityValue: itemFormData.value.bNominalQualityValue_1, // 载荷点B标称质量值(单位固定g，不存单位)
         bConvertQualityCorrectValue: itemFormData.value.bConvertQualityCorrectValue_1, // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
         ptTwo: '',
         ptTwoUnit: '',
       }
     })
   }
   else if (type === '2') { // 重复性表格Pt2
-    tableLoading_2.value = true
+    tableLoading_2.value = loading !== 'noLoading'
     list = repeatabilityPt2List.value.map((item) => {
       return {
         ...item,
@@ -561,11 +683,13 @@
         bConvertQualityCorrectValue: itemFormData.value.bConvertQualityCorrectValue_2, // 载荷点B折算质量修正值(单位固定mg，不存单位)
         ptOne: '',
         ptOneUnit: '',
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
   else if (type === '3') { // 偏载误差Pt1
-    tableLoading_3.value = true
+    tableLoading_3.value = loading !== 'noLoading'
     list = offsetErrorPt1List.value.map((item) => {
       return {
         ...item,
@@ -583,11 +707,13 @@
         ptTwo: '',
         ptTwoUnit: '',
         loadPointASValue: repeatabilityPt1List.value[0].sValue,
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
   else if (type === '4') { // 偏载误差Pt2
-    tableLoading_4.value = true
+    tableLoading_4.value = loading !== 'noLoading'
     list = offsetErrorPt2List.value.map((item) => {
       return {
         ...item,
@@ -604,11 +730,13 @@
         ptOne: '',
         ptOneUnit: '',
         loadPointBSValue: repeatabilityPt2List.value[0].sValue,
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
   else if (type === '5') { // 局部示值误差Pt1
-    tableLoading_5.value = true
+    tableLoading_5.value = loading !== 'noLoading'
     list = indicationErrorPt1List.value.map((item) => {
       return {
         ...item,
@@ -617,22 +745,19 @@
         aDeviceNumber: itemFormData.value.aDeviceNumber_5, // 载荷点A器号
         aNominalQualityValue: itemFormData.value.aNominalQualityValue_5, // 载荷点A标称质量值(单位固定g，不存单位)
         aConvertQualityCorrectValue: itemFormData.value.aConvertQualityCorrectValue_5, // 载荷点A折算质量修正值(单位固定mg，不存单位)
-        bEquipmentId: itemFormData.value.bEquipmentId_5, // 载荷点B设备id
-        bManufactureNo: itemFormData.value.bManufactureNo_5, // 载荷点B出厂编号
-        bDeviceNumber: itemFormData.value.bDeviceNumber_5, // 载荷点B器号
-        bNominalQualityValue: itemFormData.value.bNominalQualityValue_5, // 载荷点B标称质量值(单位固定g，不存单位)
-        bConvertQualityCorrectValue: itemFormData.value.bConvertQualityCorrectValue_5, // 载荷点B折算质量修正值(单位固定mg，不存单位)
         ptTwo: '',
         ptTwoUnit: '',
         loadPointASValue: repeatabilityPt1List.value[0].sValue, // 重复性的s值
         mSValue: itemFormData.value.mSValue_5, // 标准小砝码ms
         mpesValue: itemFormData.value.mpesValue_5, //	|MPEs|
         uBValue: itemFormData.value.uBValue, // Ub
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
   else if (type === '6') { // 局部示值误差Pt2
-    tableLoading_6.value = true
+    tableLoading_6.value = loading !== 'noLoading'
     list = indicationErrorPt2List.value.map((item) => {
       return {
         ...item,
@@ -644,8 +769,11 @@
         ptOne: '',
         ptOneUnit: '',
         loadPointBSValue: repeatabilityPt2List.value[0].sValue,
-        mSValue: itemFormData.value.mSValue_5, // 标准小砝码ms
-        mpesValue: itemFormData.value.mpesValue_5, //	|MPEs|
+        mSValue: itemFormData.value.mSValue_6, // 标准小砝码ms
+        mpesValue: itemFormData.value.mpesValue_6, //	|MPEs|
+        uBValue: itemFormData.value.uBValue, // Ub
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
@@ -656,7 +784,7 @@
 const calculate = (type: string) => {
   checkout(type).then(() => {
     if (!checkoutResult.value) { return false } // 校验
-    const list = solveParams(type) // 处理入参
+    const list = solveParams(type, 'loading') // 处理入参
     const params = {
       belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
       itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
@@ -743,6 +871,19 @@
     switch (type) {
       case '1':
         itemFormData.value.aManufactureNo_1 = measureEquipmentList.value[index].manufactureNo
+
+        // 重复性载荷点A设备变化，偏载误差和局部示值误差跟随改变
+        itemFormData.value.aEquipmentId_2 = itemFormData.value.aEquipmentId_1
+        itemFormData.value.aEquipmentId_3 = itemFormData.value.aEquipmentId_1
+        itemFormData.value.aEquipmentId_4 = itemFormData.value.aEquipmentId_1
+        itemFormData.value.aEquipmentId_5 = itemFormData.value.aEquipmentId_1
+        itemFormData.value.aEquipmentId_6 = itemFormData.value.aEquipmentId_1
+        // 出厂编号同理
+        itemFormData.value.aManufactureNo_2 = itemFormData.value.aManufactureNo_1
+        itemFormData.value.aManufactureNo_3 = itemFormData.value.aManufactureNo_1
+        itemFormData.value.aManufactureNo_4 = itemFormData.value.aManufactureNo_1
+        itemFormData.value.aManufactureNo_5 = itemFormData.value.aManufactureNo_1
+        itemFormData.value.aManufactureNo_6 = itemFormData.value.aManufactureNo_1
         break
       case '2':
         itemFormData.value.aManufactureNo_2 = measureEquipmentList.value[index].manufactureNo
@@ -765,6 +906,32 @@
   }
 }
 
+// 载荷点A器号改变
+const changeADeviceNumber = () => {
+  itemFormData.value.aDeviceNumber_2 = itemFormData.value.aDeviceNumber_1
+  itemFormData.value.aDeviceNumber_3 = itemFormData.value.aDeviceNumber_1
+  itemFormData.value.aDeviceNumber_4 = itemFormData.value.aDeviceNumber_1
+  itemFormData.value.aDeviceNumber_5 = itemFormData.value.aDeviceNumber_1
+  itemFormData.value.aDeviceNumber_6 = itemFormData.value.aDeviceNumber_1
+}
+
+// 载荷点A标称质量值
+const changeANominalQualityValue = () => {
+  itemFormData.value.aNominalQualityValue_2 = itemFormData.value.aNominalQualityValue_1
+  itemFormData.value.aNominalQualityValue_3 = itemFormData.value.aNominalQualityValue_1
+  itemFormData.value.aNominalQualityValue_4 = itemFormData.value.aNominalQualityValue_1
+  itemFormData.value.aNominalQualityValue_5 = itemFormData.value.aNominalQualityValue_1
+  itemFormData.value.aNominalQualityValue_6 = itemFormData.value.aNominalQualityValue_1
+}
+// 载荷点A折算质量修正值
+const changeAConvertQualityCorrectValue = () => {
+  itemFormData.value.aConvertQualityCorrectValue_2 = itemFormData.value.aConvertQualityCorrectValue_1
+  itemFormData.value.aConvertQualityCorrectValue_3 = itemFormData.value.aConvertQualityCorrectValue_1
+  itemFormData.value.aConvertQualityCorrectValue_4 = itemFormData.value.aConvertQualityCorrectValue_1
+  itemFormData.value.aConvertQualityCorrectValue_5 = itemFormData.value.aConvertQualityCorrectValue_1
+  itemFormData.value.aConvertQualityCorrectValue_6 = itemFormData.value.aConvertQualityCorrectValue_1
+}
+
 // 选择载荷点B的设备--处理出厂编号
 const selectEquipmentB = (id: string, type: string) => {
   const index = measureEquipmentList.value.findIndex((item: { id: string }) => item.id === id)
@@ -772,6 +939,16 @@
     switch (type) {
       case '1':
         itemFormData.value.bManufactureNo_1 = measureEquipmentList.value[index].manufactureNo
+
+        // 重复性载荷点B设备变化，偏载误差和局部示值误差跟随改变
+        itemFormData.value.bEquipmentId_2 = itemFormData.value.bEquipmentId_1
+        itemFormData.value.bEquipmentId_3 = itemFormData.value.bEquipmentId_1
+        itemFormData.value.bEquipmentId_4 = itemFormData.value.bEquipmentId_1
+
+        // 出厂编号同理
+        itemFormData.value.bManufactureNo_2 = itemFormData.value.bManufactureNo_1
+        itemFormData.value.bManufactureNo_3 = itemFormData.value.bManufactureNo_1
+        itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1
         break
       case '2':
         itemFormData.value.bManufactureNo_2 = measureEquipmentList.value[index].manufactureNo
@@ -787,6 +964,26 @@
     }
   }
 }
+
+// 载荷点B器号改变
+const changeBDeviceNumber = () => {
+  itemFormData.value.bDeviceNumber_2 = itemFormData.value.bDeviceNumber_1
+  itemFormData.value.bDeviceNumber_3 = itemFormData.value.bDeviceNumber_1
+  itemFormData.value.bDeviceNumber_4 = itemFormData.value.bDeviceNumber_1
+}
+
+// 载荷点B标称质量值
+const changeBNominalQualityValue = () => {
+  itemFormData.value.bNominalQualityValue_2 = itemFormData.value.bNominalQualityValue_1
+  itemFormData.value.bNominalQualityValue_3 = itemFormData.value.bNominalQualityValue_1
+  itemFormData.value.bNominalQualityValue_4 = itemFormData.value.bNominalQualityValue_1
+}
+// 载荷点B折算质量修正值
+const changeBConvertQualityCorrectValue = () => {
+  itemFormData.value.bConvertQualityCorrectValue_2 = itemFormData.value.bConvertQualityCorrectValue_1
+  itemFormData.value.bConvertQualityCorrectValue_3 = itemFormData.value.bConvertQualityCorrectValue_1
+  itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1
+}
 // ------------------------------------------钩子----------------------------------------------
 
 watch(() => props.infoId, (newValue) => {
@@ -796,81 +993,76 @@
 }, { immediate: true })
 
 // 监听重复性的载荷点A和载荷点B的数据，默认填充偏载误差和局部误差的相应数据
-watch(
-  [
-    () => itemFormData.value.aEquipmentId_1, // 设备
-    () => itemFormData.value.aDeviceNumber_1, // 器号
-    () => itemFormData.value.aNominalQualityValue_1, // 标称质量值
-    () => itemFormData.value.aConvertQualityCorrectValue_1, // 折算质量修正值
-    () => itemFormData.value.aManufactureNo_2, // 载荷点A出厂编号
-    () => itemFormData.value.bEquipmentId_1,
-    () => itemFormData.value.bDeviceNumber_1,
-    () => itemFormData.value.bNominalQualityValue_1,
-    () => itemFormData.value.bConvertQualityCorrectValue_1,
-    () => itemFormData.value.bManufactureNo_4, // 载荷点B出厂编号
-  ], (newValue: any) => {
-    console.log('监听数据', newValue)
-    // 载荷点A设备
-    if (!itemFormData.value.aEquipmentId_2) { itemFormData.value.aEquipmentId_2 = itemFormData.value.aEquipmentId_1 }
-    if (!itemFormData.value.aEquipmentId_3) { itemFormData.value.aEquipmentId_3 = itemFormData.value.aEquipmentId_1 }
-    if (!itemFormData.value.aEquipmentId_4) { itemFormData.value.aEquipmentId_4 = itemFormData.value.aEquipmentId_1 }
-    if (!itemFormData.value.aEquipmentId_5) { itemFormData.value.aEquipmentId_5 = itemFormData.value.aEquipmentId_1 }
-    if (!itemFormData.value.aEquipmentId_6) { itemFormData.value.aEquipmentId_6 = itemFormData.value.aEquipmentId_1 }
-    // 载荷点A器号
-    if (!itemFormData.value.aDeviceNumber_2) { itemFormData.value.aDeviceNumber_2 = itemFormData.value.aDeviceNumber_1 }
-    if (!itemFormData.value.aDeviceNumber_3) { itemFormData.value.aDeviceNumber_3 = itemFormData.value.aDeviceNumber_1 }
-    if (!itemFormData.value.aDeviceNumber_4) { itemFormData.value.aDeviceNumber_4 = itemFormData.value.aDeviceNumber_1 }
-    if (!itemFormData.value.aDeviceNumber_5) { itemFormData.value.aDeviceNumber_5 = itemFormData.value.aDeviceNumber_1 }
-    if (!itemFormData.value.aDeviceNumber_6) { itemFormData.value.aDeviceNumber_6 = itemFormData.value.aDeviceNumber_1 }
-    // 载荷点A标称质量值
-    if (!itemFormData.value.aNominalQualityValue_2) { itemFormData.value.aNominalQualityValue_2 = itemFormData.value.aNominalQualityValue_1 }
-    if (!itemFormData.value.aNominalQualityValue_3) { itemFormData.value.aNominalQualityValue_3 = itemFormData.value.aNominalQualityValue_1 }
-    if (!itemFormData.value.aNominalQualityValue_4) { itemFormData.value.aNominalQualityValue_4 = itemFormData.value.aNominalQualityValue_1 }
-    if (!itemFormData.value.aNominalQualityValue_5) { itemFormData.value.aNominalQualityValue_5 = itemFormData.value.aNominalQualityValue_1 }
-    if (!itemFormData.value.aNominalQualityValue_6) { itemFormData.value.aNominalQualityValue_6 = itemFormData.value.aNominalQualityValue_1 }
+// watch(
+//   [
+//     () => itemFormData.value.aEquipmentId_1, // 设备
+//     () => itemFormData.value.aDeviceNumber_1, // 器号
+//     () => itemFormData.value.aNominalQualityValue_1, // 标称质量值
+//     () => itemFormData.value.aConvertQualityCorrectValue_1, // 折算质量修正值
+//     () => itemFormData.value.aManufactureNo_1, // 载荷点A出厂编号
+//     () => itemFormData.value.bEquipmentId_1,
+//     () => itemFormData.value.bDeviceNumber_1,
+//     () => itemFormData.value.bNominalQualityValue_1,
+//     () => itemFormData.value.bConvertQualityCorrectValue_1,
+//     () => itemFormData.value.bManufactureNo_1, // 载荷点B出厂编号
+//   ], (newValue: any) => {
+//     console.log('监听数据', newValue)
+//     // 载荷点A设备
+//     itemFormData.value.aEquipmentId_2 = itemFormData.value.aEquipmentId_1
+//     itemFormData.value.aEquipmentId_3 = itemFormData.value.aEquipmentId_1
+//     itemFormData.value.aEquipmentId_4 = itemFormData.value.aEquipmentId_1
+//     itemFormData.value.aEquipmentId_5 = itemFormData.value.aEquipmentId_1
+//     itemFormData.value.aEquipmentId_6 = itemFormData.value.aEquipmentId_1
+//     // 载荷点A器号
+//     itemFormData.value.aDeviceNumber_2 = itemFormData.value.aDeviceNumber_1
+//     itemFormData.value.aDeviceNumber_3 = itemFormData.value.aDeviceNumber_1
+//     itemFormData.value.aDeviceNumber_4 = itemFormData.value.aDeviceNumber_1
+//     itemFormData.value.aDeviceNumber_5 = itemFormData.value.aDeviceNumber_1
+//     itemFormData.value.aDeviceNumber_6 = itemFormData.value.aDeviceNumber_1
+//     // 载荷点A标称质量值
+//     itemFormData.value.aNominalQualityValue_2 = itemFormData.value.aNominalQualityValue_1
+//     itemFormData.value.aNominalQualityValue_3 = itemFormData.value.aNominalQualityValue_1
+//     itemFormData.value.aNominalQualityValue_4 = itemFormData.value.aNominalQualityValue_1
+//     itemFormData.value.aNominalQualityValue_5 = itemFormData.value.aNominalQualityValue_1
+//     itemFormData.value.aNominalQualityValue_6 = itemFormData.value.aNominalQualityValue_1
 
-    // 载荷点A折算质量修正值
-    if (!itemFormData.value.aConvertQualityCorrectValue_2) { itemFormData.value.aConvertQualityCorrectValue_2 = itemFormData.value.aConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.aConvertQualityCorrectValue_3) { itemFormData.value.aConvertQualityCorrectValue_3 = itemFormData.value.aConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.aConvertQualityCorrectValue_4) { itemFormData.value.aConvertQualityCorrectValue_4 = itemFormData.value.aConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.aConvertQualityCorrectValue_5) { itemFormData.value.aConvertQualityCorrectValue_5 = itemFormData.value.aConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.aConvertQualityCorrectValue_6) { itemFormData.value.aConvertQualityCorrectValue_6 = itemFormData.value.aConvertQualityCorrectValue_1 }
+//     // 载荷点A折算质量修正值
+//     itemFormData.value.aConvertQualityCorrectValue_2 = itemFormData.value.aConvertQualityCorrectValue_1
+//     itemFormData.value.aConvertQualityCorrectValue_3 = itemFormData.value.aConvertQualityCorrectValue_1
+//     itemFormData.value.aConvertQualityCorrectValue_4 = itemFormData.value.aConvertQualityCorrectValue_1
+//     itemFormData.value.aConvertQualityCorrectValue_5 = itemFormData.value.aConvertQualityCorrectValue_1
+//     itemFormData.value.aConvertQualityCorrectValue_6 = itemFormData.value.aConvertQualityCorrectValue_1
 
-    // 载荷点A出厂编号
-    if (!itemFormData.value.aManufactureNo_2) { itemFormData.value.aManufactureNo_2 = itemFormData.value.aManufactureNo_1 }
-    if (!itemFormData.value.aManufactureNo_3) { itemFormData.value.aManufactureNo_3 = itemFormData.value.aManufactureNo_1 }
-    if (!itemFormData.value.aManufactureNo_4) { itemFormData.value.aManufactureNo_4 = itemFormData.value.aManufactureNo_1 }
-    if (!itemFormData.value.aManufactureNo_5) { itemFormData.value.aManufactureNo_5 = itemFormData.value.aManufactureNo_1 }
-    if (!itemFormData.value.aManufactureNo_6) { itemFormData.value.aManufactureNo_6 = itemFormData.value.aManufactureNo_1 }
+//     // 载荷点A出厂编号
+//     itemFormData.value.aManufactureNo_2 = itemFormData.value.aManufactureNo_1
+//     itemFormData.value.aManufactureNo_3 = itemFormData.value.aManufactureNo_1
+//     itemFormData.value.aManufactureNo_4 = itemFormData.value.aManufactureNo_1
+//     itemFormData.value.aManufactureNo_5 = itemFormData.value.aManufactureNo_1
+//     itemFormData.value.aManufactureNo_6 = itemFormData.value.aManufactureNo_1
 
-    // 载荷点B设备
-    if (!itemFormData.value.bEquipmentId_2) { itemFormData.value.bEquipmentId_2 = itemFormData.value.bEquipmentId_1 }
-    if (!itemFormData.value.bEquipmentId_3) { itemFormData.value.bEquipmentId_3 = itemFormData.value.bEquipmentId_1 }
-    if (!itemFormData.value.bEquipmentId_4) { itemFormData.value.bEquipmentId_4 = itemFormData.value.bEquipmentId_1 }
-    if (!itemFormData.value.bEquipmentId_5) { itemFormData.value.bEquipmentId_5 = itemFormData.value.bEquipmentId_1 }
-    // 载荷点B器号
-    if (!itemFormData.value.bDeviceNumber_2) { itemFormData.value.bDeviceNumber_2 = itemFormData.value.bDeviceNumber_1 }
-    if (!itemFormData.value.bDeviceNumber_3) { itemFormData.value.bDeviceNumber_3 = itemFormData.value.bDeviceNumber_1 }
-    if (!itemFormData.value.bDeviceNumber_4) { itemFormData.value.bDeviceNumber_4 = itemFormData.value.bDeviceNumber_1 }
-    if (!itemFormData.value.bDeviceNumber_5) { itemFormData.value.bDeviceNumber_5 = itemFormData.value.bDeviceNumber_1 }
-    // 载荷点B标称质量值
-    if (!itemFormData.value.bNominalQualityValue_2) { itemFormData.value.bNominalQualityValue_2 = itemFormData.value.bNominalQualityValue_1 }
-    if (!itemFormData.value.bNominalQualityValue_3) { itemFormData.value.bNominalQualityValue_3 = itemFormData.value.bNominalQualityValue_1 }
-    if (!itemFormData.value.bNominalQualityValue_4) { itemFormData.value.bNominalQualityValue_4 = itemFormData.value.bNominalQualityValue_1 }
-    if (!itemFormData.value.bNominalQualityValue_5) { itemFormData.value.bNominalQualityValue_5 = itemFormData.value.bNominalQualityValue_1 }
+//     // 载荷点B设备
+//     itemFormData.value.bEquipmentId_2 = itemFormData.value.bEquipmentId_1
+//     itemFormData.value.bEquipmentId_3 = itemFormData.value.bEquipmentId_1
+//     itemFormData.value.bEquipmentId_4 = itemFormData.value.bEquipmentId_1
+//     // 载荷点B器号
+//     itemFormData.value.bDeviceNumber_2 = itemFormData.value.bDeviceNumber_1
+//     itemFormData.value.bDeviceNumber_3 = itemFormData.value.bDeviceNumber_1
+//     itemFormData.value.bDeviceNumber_4 = itemFormData.value.bDeviceNumber_1
+//     // 载荷点B标称质量值
+//     itemFormData.value.bNominalQualityValue_2 = itemFormData.value.bNominalQualityValue_1
+//     itemFormData.value.bNominalQualityValue_3 = itemFormData.value.bNominalQualityValue_1
+//     itemFormData.value.bNominalQualityValue_4 = itemFormData.value.bNominalQualityValue_1
 
-    // 载荷点B折算质量修正值
-    if (!itemFormData.value.bConvertQualityCorrectValue_2) { itemFormData.value.bConvertQualityCorrectValue_2 = itemFormData.value.bConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.bConvertQualityCorrectValue_3) { itemFormData.value.bConvertQualityCorrectValue_3 = itemFormData.value.bConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.bConvertQualityCorrectValue_4) { itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.bConvertQualityCorrectValue_5) { itemFormData.value.bConvertQualityCorrectValue_5 = itemFormData.value.bConvertQualityCorrectValue_1 }
+//     // 载荷点B折算质量修正值
+//     itemFormData.value.bConvertQualityCorrectValue_2 = itemFormData.value.bConvertQualityCorrectValue_1
+//     itemFormData.value.bConvertQualityCorrectValue_3 = itemFormData.value.bConvertQualityCorrectValue_1
+//     itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1
 
-    // 载荷点B出厂编号
-    if (!itemFormData.value.bManufactureNo_2) { itemFormData.value.bManufactureNo_2 = itemFormData.value.bManufactureNo_1 }
-    if (!itemFormData.value.bManufactureNo_3) { itemFormData.value.bManufactureNo_3 = itemFormData.value.bManufactureNo_1 }
-    if (!itemFormData.value.bManufactureNo_4) { itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1 }
-    if (!itemFormData.value.bManufactureNo_5) { itemFormData.value.bManufactureNo_5 = itemFormData.value.bManufactureNo_1 }
-  }, { deep: true, immediate: true })
+//     // 载荷点B出厂编号
+//     itemFormData.value.bManufactureNo_2 = itemFormData.value.bManufactureNo_1
+//     itemFormData.value.bManufactureNo_3 = itemFormData.value.bManufactureNo_1
+//     itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1
+//   }, { deep: true, immediate: true })
 
 onMounted(() => {
   if (pageType.value === 'add') { // 从我的任务跳转过来（新增）
@@ -887,11 +1079,13 @@
     itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id
     itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code
     itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称
-    // fetchInfo()
+    // 查输入值(查检定项管理的详情)
+    fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string, false)
+    fetchInfo()
   }
 })
 
-defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType })
+defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType, solveParamsBeforeSave })
 </script>
 
 <template>
@@ -987,6 +1181,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '器号'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeADeviceNumber"
                 />
               </el-form-item>
               <el-form-item label-width="10px" prop="aNominalQualityValue_1">
@@ -995,6 +1190,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '标称质量值'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeANominalQualityValue"
                 />
               </el-form-item>g
               <el-form-item label-width="10px" prop="aConvertQualityCorrectValue_1">
@@ -1003,6 +1199,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '折算质量修正值'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeAConvertQualityCorrectValue"
                 />
               </el-form-item>mg
             </el-col>
@@ -1022,6 +1219,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '器号'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeBDeviceNumber"
                 />
               </el-form-item>
               <el-form-item label-width="10px" prop="bNominalQualityValue_1">
@@ -1030,6 +1228,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '标称质量值'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeBNominalQualityValue"
                 />
               </el-form-item>g
               <el-form-item label-width="10px" prop="bConvertQualityCorrectValue_1">
@@ -1038,6 +1237,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '折算质量修正值'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeBConvertQualityCorrectValue"
                 />
               </el-form-item>mg
             </el-col>
@@ -1156,7 +1356,7 @@
           </span>
           <!-- 实验载荷Pt2  -->
           <span style="color: #606266;font-size: 14px;margin-left: 10px;white-space: nowrap;">
-            实验载荷Pt2: {{ itemFormData.ptTwo }}{{ itemFormData.ptTwoUnit }}
+            实验载荷Pt1: {{ itemFormData.ptOne }}{{ itemFormData.ptOneUnit }}
           </span>
           <!-- 秤量盘形式 -->
           <span style="color: #606266;font-size: 15px;white-space: nowrap;margin-left: 20px;margin-right: 10px;">秤量盘形式:</span>
@@ -1380,7 +1580,7 @@
             <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-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_5" :label="item.manufactureNo" :value="item.id">
+                  <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>
                   </el-option>

diff --git a/src/views/business/subpackage/review/components/basic.vue b/src/views/business/subpackage/review/components/basic.vue
index 81cc0ea..8e34d5e 100644
--- a/src/views/business/subpackage/review/components/basic.vue
+++ b/src/views/business/subpackage/review/components/basic.vue
@@ -79,6 +79,8 @@
   addressCityName: '', // 公司地址-市
   addressCountryName: '', // 公司地址-国家
   addressProvinceName: '', // 公司地址-省
+
+  item: '', // 分包项项目
 })
 const fullAddress = ref<string[]>([]) // 公司地址
 const ruleFormRef = ref() // 表单ref
@@ -114,6 +116,7 @@
   traceability: [{ required: true, message: '溯源性不能为空', trigger: 'blur' }],
   testMethod: [{ required: true, message: '测试方法不能为空', trigger: 'blur' }],
   techniqueAbility: [{ required: true, message: '技术能力不能为空', trigger: 'blur' }],
+  item: [{ required: true, message: '分包项目不能为空', trigger: 'blur' }],
 })
 // -------------------------------------------文件上传--------------------------------------
 const fileRef = ref() // 文件上传input
@@ -147,7 +150,16 @@
 const outsourceReasonList = ref<dictType[]>([]) // 分包原因
 const labCodeList = ref<dictType[]>([]) // 实验室代码
 const groupCodeList = ref<dictType[]>([]) // 组别代码
-function getDict() {
+const meterIdentifyDict = ref<dictType[]>([]) // 计量标识
+const meterIdentifyMap = ref([]) as any // 计量标识
+
+async function getDict() {
+  // 计量标识
+  const response = await getDictByCode('eqptMeterIdentify')
+  response.data.forEach((item: { value: string; name: string }) => {
+    meterIdentifyMap.value[`${item.value}`] = item.name
+  })
+  meterIdentifyDict.value = response.data
   // 实验室代码
   getDictByCode('bizLabCode').then((response) => {
     labCodeList.value = response.data
@@ -157,9 +169,9 @@
     groupCodeList.value = response.data
   })
   // 分包原因
-  getDictByCode('outsourceReason').then((response) => {
-    outsourceReasonList.value = response.data
-  })
+  // getDictByCode('outsourceReason').then((response) => {
+  //   outsourceReasonList.value = response.data
+  // })
 }
 // ----------------------------------------选择分包方编号--------------------------------------
 const selectOutsourcerNoDialogRef = ref() // 选择分包方组件ref
@@ -170,7 +182,6 @@
 
 // 确定选择分包方
 const confirmSelectOutsourcerNo = (val: any) => {
-  console.log(val)
   form.value.outsourcerId = val[0].id // 分包方id
   form.value.outsourcerNo = val[0].outsourcerNo // 分包方编号
   form.value.outsourcerName = val[0].outsourcerName // 分包机构名称
@@ -191,12 +202,15 @@
 const checkoutList = ref([]) // 选中的内容
 
 const columns = ref([
-  { text: '受检设备编号', value: 'equipmentNo', align: 'center', width: '160' },
-  { text: '受检设备名称', value: 'equipmentName', align: 'center' },
-  { text: '型号', value: 'model', align: 'center' },
-  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: false },
+  { text: '型号规格', value: 'model', align: 'center', required: false },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center', required: false },
+  { text: '生产厂家', value: 'manufacturer', align: 'center', required: false },
+  { text: '辅助字段', value: 'helpInstruction', align: 'center', required: false },
   { text: '任务单编号', value: 'orderNo', align: 'center', width: '160' },
   { text: '委托单位', value: 'customerName', align: 'center', width: '90' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', required: true },
+  { text: '检定有效期', value: 'certificateValid', align: 'center', required: false, width: '120' },
 ])
 
 // 多选发生改变时
@@ -220,10 +234,10 @@
 
   val.forEach((item: any) => {
     // 只添加列表里不存在的
-    const index = list.value.findIndex(
-      (i: any) => item.equipmentNo === i.equipmentNo,
-    )
+    const index = list.value.findIndex((i: any) => item.equipmentNo === i.equipmentNo)
     if (index === -1) {
+      item.meterIdentifyName = meterIdentifyMap.value[item.meterIdentify]
+      item.certificateValid = dayjs(item.certificateValid).format('YYYY-MM-DD')
       list.value.push(item)
     }
   })
@@ -255,7 +269,13 @@
   getInfo({ id: infoId.value }).then((res) => {
     // loading.value = false
     form.value = res.data
-    list.value = res.data.equipmentList
+    list.value = res.data.equipmentList.map((item: { meterIdentify: string; validate: string }) => {
+      return {
+        ...item,
+        meterIdentifyName: meterIdentifyMap.value[item.meterIdentify],
+        certificateValid: dayjs(item.validate).format('YYYY-MM-DD'),
+      }
+    })
     getDirectoriesDetail({ id: res.data.outsourcerId }).then((response) => {
       loading.value = false
       fullAddress.value = [response.data.addressCountryName, response.data.addressProvinceName, response.data.addressCityName, response.data.addressAreaName, response.data.fullAddress]
@@ -269,6 +289,10 @@
  * @param formEl 基本信息表单ref
  */
 const saveForm = async () => {
+  if (!list.value.length) {
+    ElMessage.warning('受检设备信息不能为空')
+    return false
+  }
   await ruleFormRef.value.validate((valid: boolean) => {
     if (valid) {
       // 基本信息表单通过校验
@@ -378,16 +402,17 @@
 )
 
 onMounted(async () => {
-  await getDict() // 获取字典
-  if (props.pageType !== 'add' && infoId.value) {
-    fetchInfo() // 获取详情信息
-  }
-  if (props.pageType === 'add') {
-    form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
-    form.value.applicantId = user.id // 申请人id
-    form.value.applicantName = user.name // 申请人名字
-    form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
-  }
+  getDict().then(() => {
+    if (props.pageType !== 'add' && infoId.value) {
+      fetchInfo() // 获取详情信息
+    }
+    if (props.pageType === 'add') {
+      form.value.projectName = '测试、校准或检定工作分包评审表' // 评审表名称
+      form.value.applicantId = user.id // 申请人id
+      form.value.applicantName = user.name // 申请人名字
+      form.value.applicantTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 申请时间
+    }
+  })
 })
 
 defineExpose({ saveForm, submitForm })
@@ -564,7 +589,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="分包原因:" prop="outsourceReason">
             <el-select
               v-model="form.outsourceReason"
@@ -580,7 +605,7 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="预计费用(元):" prop="preCost">
             <el-input
@@ -598,6 +623,20 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="12">
+          <el-form-item label="分包项目:" prop="item">
+            <el-input
+              v-model="form.item"
+              type="textarea"
+              autosize
+              :placeholder="pageType === 'detail' ? ' ' : '请输入分包项目'"
+              :disabled="pageType === 'detail'"
+              :class="{ 'detail-input': pageType === 'detail' }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="实验室认可情况:" prop="approveSituation">
             <el-input
               v-model="form.approveSituation"
diff --git a/src/views/business/subpackage/review/review-interface.ts b/src/views/business/subpackage/review/review-interface.ts
index b2305cb..891350e 100644
--- a/src/views/business/subpackage/review/review-interface.ts
+++ b/src/views/business/subpackage/review/review-interface.ts
@@ -66,6 +66,8 @@
   addressCityName: string // 公司地址-市
   addressCountryName: string // 公司地址-国家
   addressProvinceName: string // 公司地址-省
+
+  item: string // 分包项目
 }
 
 // 分包方人员
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts b/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts
index e8e8f6f..ac55198 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/eighth/eighth-interface.ts
@@ -22,25 +22,25 @@
 
   ptOne: string //		实验载荷Pt1
   ptOneUnit: string //		实验载荷Pt1单位
-  aequipmentId: string // 载荷点A设备id
-  adeviceNumber: number // 载荷点A器号
-  anominalQualityValue: number // 载荷点A标称质量值(单位固定g，不存单位)
-  aconvertQualityCorrectValue: number // 载荷点A折算质量修正值(单位固定mg，不存单位)
-  amanufactureNo: string // 载荷点A出厂编号
+  aEquipmentId: string // 载荷点A设备id
+  aDeviceNumber: undefined // 载荷点A器号
+  aNominalQualityValue: undefined // 载荷点A标称质量值(单位固定g，不存单位)
+  aConvertQualityCorrectValue: undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+  aManufactureNo: string // 载荷点A出厂编号
 
-  bequipmentId: string // 载荷点B设备id
-  bdeviceNumber: string // 载荷点B器号
-  bnominalQualityValue: string // 载荷点B标称质量值(单位固定g，不存单位)
-  bconvertQualityCorrectValue: string // 载荷点B折算质量修正值(单位固定mg，不存单位)
-  bmanufactureNo: string // 载荷点B出厂编号
+  bEquipmentId: string // 载荷点B设备id
+  bDeviceNumber: undefined // 载荷点B器号
+  bNominalQualityValue: undefined // 载荷点B标称质量值(单位固定g，不存单位)
+  bConvertQualityCorrectValue: undefined// 载荷点B折算质量修正值(单位固定mg，不存单位)
+  bManufactureNo: string // 载荷点B出厂编号
 
   ptTwo: string // 实验载荷Pt2
   ptTwoUnit: string // 实验载荷Pt2单位
 
   scalePlateForm: string // 秤量盘形式
-  mSValue: string // 标准小砝码ms
-  mpesValue: string // |MPEs|
-  uBValue: string // Ub
+  mSValue: undefined // 标准小砝码ms
+  mpesValue: undefined // |MPEs|
+  uBValue: undefined // Ub
 
   actualDivisionValue: string //		实际分度值d，该参数在结果处理表中每行都要传
   actualDivisionValueUnit: string //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
diff --git a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
index 542acfa..017127d 100644
--- a/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/eighth/templateDetail.vue
@@ -98,11 +98,6 @@
   aNominalQualityValue_5: undefined, // 载荷点A标称质量值(单位固定g，不存单位)
   aConvertQualityCorrectValue_5: undefined, // 载荷点A折算质量修正值(单位固定mg，不存单位)
   aManufactureNo_5: '', // 载荷点A出厂编号
-  bEquipmentId_5: '', // 载荷点B设备id
-  bDeviceNumber_5: undefined, // 载荷点B器号
-  bNominalQualityValue_5: undefined, // 载荷点B标称质量值(单位固定g，不存单位)
-  bConvertQualityCorrectValue_5: undefined, // 载荷点B折算质量修正值(单位固定mg，不存单位)
-  bManufactureNo_5: '', // 载荷点B出厂编号
   mSValue_5: undefined, // 标准小砝码ms
   mpesValue_5: undefined, //		|MPEs|
   uBValue: undefined, // Ub
@@ -267,7 +262,7 @@
   { text: 'A(mr2) / g', value: 'aTwo', align: 'center', required: true, width: '180' },
   { text: '△m<sub>i</sub> / mg', value: 'deltaM', align: 'center', required: false },
   { text: '△m均值 / mg', value: 'deltaMAverage', align: 'center', required: false },
-  { text: 'm<sub>s</sub> - △m均值/mg', value: 'mreduceDeltaM', align: 'center', required: false },
+  { text: 'm<sub>s</sub> - △m均值/mg', value: 'mReduceDeltaM', align: 'center', required: false },
   { text: 'U<sub>S</sub> / mg', value: 'uSValue', align: 'center', required: false },
 ])
 // -------------------------------------------获取详情信息--------------------------------------------------
@@ -294,90 +289,190 @@
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
+    if (res && res.data && res.data.measureDataETwoList.length) {
+      itemFormData.value.remark = res.data.remark // 结论、备注
+      const responseList = res.data.measureDataETwoList.map((item: IDetailMeasureList) => {
+        return {
+          ...item,
+          aOne: `${item.aOne}` === '' ? undefined : item.aOne,
+          bOne: `${item.bOne}` === '' ? undefined : item.bOne,
+          bTwo: `${item.bTwo}` === '' ? undefined : item.bTwo,
+          aTwo: `${item.aTwo}` === '' ? undefined : item.aTwo,
+        }
+      })
+      repeatabilityPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '1' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '重复性' } })
+      repeatabilityPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '1' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '重复性' } })
+      offsetErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } })
+      offsetErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '2' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '偏载误差' } })
+      indicationErrorPt1List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` !== '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } })
+      indicationErrorPt2List.value = responseList.filter((item: { dataType: string; ptOne: string }) => item.dataType === '3' && `${item.ptOne}` === '').map((item: IDetailMeasureList) => { return { ...item, params: '局部示值误差' } })
+      if (repeatabilityPt1List.value.length) {
+        itemFormData.value.aEquipmentId_1 = repeatabilityPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1
+        itemFormData.value.aDeviceNumber_1 = repeatabilityPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_1 = repeatabilityPt1List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_1 = repeatabilityPt1List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_1 = repeatabilityPt1List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.bEquipmentId_1 = repeatabilityPt1List.value[0].bEquipmentId || '' // 载荷点B设备id
+        itemFormData.value.bDeviceNumber_1 = repeatabilityPt1List.value[0].bDeviceNumber || undefined // 载荷点B器号
+        itemFormData.value.bNominalQualityValue_1 = repeatabilityPt1List.value[0].bNominalQualityValue || undefined // 载荷点B标称质量值(单位固定g，不存单位)
+        itemFormData.value.bConvertQualityCorrectValue_1 = repeatabilityPt1List.value[0].bConvertQualityCorrectValue || undefined // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.bManufactureNo_1 = repeatabilityPt1List.value[0].bManufactureNo || '' // 载荷点B出厂编号
+      }
+      if (repeatabilityPt2List.value.length) {
+        // 重复性-实验载荷Pt2
+        itemFormData.value.aEquipmentId_2 = repeatabilityPt2List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1
+        itemFormData.value.aDeviceNumber_2 = repeatabilityPt2List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_2 = repeatabilityPt2List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_2 = repeatabilityPt2List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_2 = repeatabilityPt2List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.bEquipmentId_2 = repeatabilityPt2List.value[0].bEquipmentId || '' // 载荷点B设备id
+        itemFormData.value.bDeviceNumber_2 = repeatabilityPt2List.value[0].bDeviceNumber || undefined // 载荷点B器号
+        itemFormData.value.bNominalQualityValue_2 = repeatabilityPt2List.value[0].bNominalQualityValue || undefined // 载荷点B标称质量值(单位固定g，不存单位)
+        itemFormData.value.bConvertQualityCorrectValue_2 = repeatabilityPt2List.value[0].bConvertQualityCorrectValue || undefined // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.bManufactureNo_2 = repeatabilityPt2List.value[0].bManufactureNo || '' // 载荷点B出厂编号
+      }
 
-    // list.value = res.data.measureDataPistonGaugeList.map((item: IDetailMeasureList) => {
-    //   return {
-    //     ...item,
-    //     editable: pageType.value !== 'detail',
-    //   }
-    // }) // 检定数据
+      if (offsetErrorPt1List.value.length) {
+        // 重复性-实验载荷Pt2
+        itemFormData.value.aEquipmentId_3 = offsetErrorPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1
+        itemFormData.value.aDeviceNumber_3 = offsetErrorPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_3 = offsetErrorPt1List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_3 = offsetErrorPt1List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_3 = offsetErrorPt1List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.bEquipmentId_3 = offsetErrorPt1List.value[0].bEquipmentId || '' // 载荷点B设备id
+        itemFormData.value.bDeviceNumber_3 = offsetErrorPt1List.value[0].bDeviceNumber || undefined // 载荷点B器号
+        itemFormData.value.bNominalQualityValue_3 = offsetErrorPt1List.value[0].bNominalQualityValue || undefined // 载荷点B标称质量值(单位固定g，不存单位)
+        itemFormData.value.bConvertQualityCorrectValue_3 = offsetErrorPt1List.value[0].bConvertQualityCorrectValue || undefined // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.bManufactureNo_3 = offsetErrorPt1List.value[0].bManufactureNo || '' // 载荷点B出厂编号
+        // 称量盘形式
+        itemFormData.value.scalePlateForm = offsetErrorPt1List.value[0].scalePlateForm
+      }
 
+      if (offsetErrorPt2List.value.length) {
+        // 重复性-实验载荷Pt2
+        itemFormData.value.aEquipmentId_4 = offsetErrorPt2List.value[0].aEquipmentId || '' // 载荷点A设备id 1表示第一个表格即重复性实验载荷Pt1
+        itemFormData.value.aDeviceNumber_4 = offsetErrorPt2List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_4 = offsetErrorPt2List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_4 = offsetErrorPt2List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_4 = offsetErrorPt2List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.bEquipmentId_4 = offsetErrorPt2List.value[0].bEquipmentId || '' // 载荷点B设备id
+        itemFormData.value.bDeviceNumber_4 = offsetErrorPt2List.value[0].bDeviceNumber || undefined // 载荷点B器号
+        itemFormData.value.bNominalQualityValue_4 = offsetErrorPt2List.value[0].bNominalQualityValue || undefined // 载荷点B标称质量值(单位固定g，不存单位)
+        itemFormData.value.bConvertQualityCorrectValue_4 = offsetErrorPt2List.value[0].bConvertQualityCorrectValue || undefined // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.bManufactureNo_4 = offsetErrorPt2List.value[0].bManufactureNo || '' // 载荷点B出厂编号
+      }
+
+      if (indicationErrorPt1List.value.length) {
+        // 局部示值误差-实验载荷Pt1
+        itemFormData.value.aEquipmentId_5 = indicationErrorPt1List.value[0].aEquipmentId || '' // 载荷点A设备id 2表示第一个表格即重复性实验载荷Pt2
+        itemFormData.value.aDeviceNumber_5 = indicationErrorPt1List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_5 = indicationErrorPt1List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_5 = indicationErrorPt1List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_5 = indicationErrorPt1List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.mSValue_5 = indicationErrorPt1List.value[0].mSValue || undefined // 标准小砝码ms
+        itemFormData.value.mpesValue_5 = indicationErrorPt1List.value[0].mpesValue || undefined //		|MPEs|
+        itemFormData.value.uBValue = indicationErrorPt1List.value[0].uBValue || undefined // Ub
+      }
+
+      if (indicationErrorPt2List.value.length) {
+        // 局部示值误差-实验载荷Pt2
+        itemFormData.value.aEquipmentId_6 = indicationErrorPt2List.value[0].aEquipmentId || '' // 载荷点A设备id 2表示第一个表格即重复性实验载荷Pt2
+        itemFormData.value.aDeviceNumber_6 = indicationErrorPt2List.value[0].aDeviceNumber || undefined // 载荷点A器号
+        itemFormData.value.aNominalQualityValue_6 = indicationErrorPt2List.value[0].aNominalQualityValue || undefined // 载荷点A标称质量值(单位固定g，不存单位)
+        itemFormData.value.aConvertQualityCorrectValue_6 = indicationErrorPt2List.value[0].aConvertQualityCorrectValue || undefined // 载荷点A折算质量修正值(单位固定mg，不存单位)
+        itemFormData.value.aManufactureNo_6 = indicationErrorPt2List.value[0].aManufactureNo || '' // 载荷点A出厂编号
+        itemFormData.value.mSValue_6 = indicationErrorPt2List.value[0].mSValue || undefined // 标准小砝码ms
+        itemFormData.value.mpesValue_6 = indicationErrorPt2List.value[0].mpesValue || undefined //		|MPEs|
+      }
+    }
     infoId.value = res.data.id
     emits('giveInfoId', infoId.value)
     loading.close()
   })
 }
-// 初始化输入数据
-const initInputData = (data: any) => {
+/**
+ * 初始化输入数据
+ * @param data 要处理的数据
+ * @param solveList 是否处理表格数据
+ */
+const initInputData = (data: any, solveList = true) => {
   itemFormData.value.ptOne = data[0].ptOne //	实验载荷Pt1
   itemFormData.value.ptOneUnit = data[0].ptOneUnit // 实验载荷Pt1单位
   itemFormData.value.ptTwo = data[0].ptTwo // 实验载荷Pt2
   itemFormData.value.ptTwoUnit = data[0].ptTwoUnit// 实验载荷Pt2单位
   itemFormData.value.actualDivisionValue = data[0].actualDivisionValue //	实际分度值d，该参数在结果处理表中每行都要传
   itemFormData.value.actualDivisionValueUnit = data[0].actualDivisionValueUnit // 实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
-  // 清空数据
-  repeatabilityPt1List.value = [] // 重复性表格Pt1
-  repeatabilityPt2List.value = [] // 重复性表格Pt2
-  offsetErrorPt1List.value = [] // 偏载误差Pt1
-  offsetErrorPt2List.value = [] // 偏载误差Pt2
-  indicationErrorPt1List.value = [] // 局部示值误差Pt1
-  indicationErrorPt2List.value = [] // 局部示值误差Pt2
-  // 重复性表格Pt1、Pt2
-  for (let i = 1; i <= 10; i++) {
-    repeatabilityPt1List.value.push({
-      ...data[0],
-      params: '重复性',
-      measureSequence: i,
-      dataType: '1',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-    repeatabilityPt2List.value.push({
-      ...data[0],
-      params: '重复性',
-      measureSequence: i,
-      dataType: '1',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-  }
-  // 偏载误差
-  for (let i = 1; i <= 4; i++) {
-    offsetErrorPt1List.value.push({
-      ...data[0],
-      params: '偏载误差',
-      measureSequence: i === 1 ? '前' : i === 2 ? '后' : i === 3 ? '左' : '右',
-      dataType: '2',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-    offsetErrorPt2List.value.push({
-      ...data[0],
-      params: '偏载误差',
-      measureSequence: i === 1 ? '前' : i === 2 ? '后' : i === 3 ? '左' : '右',
-      dataType: '2',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-  }
-  // 局部示值误差
-  for (let i = 1; i <= 3; i++) {
-    indicationErrorPt1List.value.push({
-      ...data[0],
-      params: '局部示值误差',
-      measureSequence: i,
-      dataType: '3',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
-    indicationErrorPt2List.value.push({
-      ...data[0],
-      params: '局部示值误差',
-      measureSequence: i,
-      dataType: '3',
-      actualDivisionValue: data[0].actualDivisionValue,
-      actualDivisionValueUnit: data[0].actualDivisionValueUnit,
-    })
+  if (solveList) {
+    // 清空数据
+    repeatabilityPt1List.value = [] // 重复性表格Pt1
+    repeatabilityPt2List.value = [] // 重复性表格Pt2
+    offsetErrorPt1List.value = [] // 偏载误差Pt1
+    offsetErrorPt2List.value = [] // 偏载误差Pt2
+    indicationErrorPt1List.value = [] // 局部示值误差Pt1
+    indicationErrorPt2List.value = [] // 局部示值误差Pt2
+    // 重复性表格Pt1、Pt2
+    for (let i = 1; i <= 10; i++) {
+      repeatabilityPt1List.value.push({
+        ...data[0],
+        params: '重复性',
+        measureSequence: i,
+        dataType: '1',
+        id: '',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+      })
+      repeatabilityPt2List.value.push({
+        ...data[0],
+        params: '重复性',
+        measureSequence: i,
+        dataType: '1',
+        id: '',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+      })
+    }
+    // 偏载误差
+    for (let i = 1; i <= 4; i++) {
+      offsetErrorPt1List.value.push({
+        ...data[0],
+        params: '偏载误差',
+        measureSequence: i === 1 ? '前' : i === 2 ? '后' : i === 3 ? '左' : '右',
+        id: '',
+        dataType: '2',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+      })
+      offsetErrorPt2List.value.push({
+        ...data[0],
+        params: '偏载误差',
+        measureSequence: i === 1 ? '前' : i === 2 ? '后' : i === 3 ? '左' : '右',
+        id: '',
+        dataType: '2',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+      })
+    }
+    // 局部示值误差
+    for (let i = 1; i <= 3; i++) {
+      indicationErrorPt1List.value.push({
+        ...data[0],
+        params: '局部示值误差',
+        measureSequence: i,
+        dataType: '3',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+        id: '',
+      })
+      indicationErrorPt2List.value.push({
+        ...data[0],
+        params: '局部示值误差',
+        measureSequence: i,
+        dataType: '3',
+        actualDivisionValue: data[0].actualDivisionValue,
+        actualDivisionValueUnit: data[0].actualDivisionValueUnit,
+        id: '',
+      })
+    }
   }
 }
 
@@ -386,8 +481,9 @@
  * @param itemId  检定项id
  * @param itemCategoryName 检定项分类名字
  * @param belongStandardEquipment 检校标准装置字典
+ * @param solveList 是否处理表格
  */
-const fetchItemInfo = (itemId: string, itemCategoryName: string, belongStandardEquipment = '') => {
+const fetchItemInfo = (itemId: string, itemCategoryName: string, belongStandardEquipment = '', solveList = true) => {
   const params = {
     id: itemId,
     itemCategoryName, // 检定项分类名字
@@ -400,12 +496,12 @@
     itemFormData.value.partialLoadError = `${res.data.partialLoadError}` === '1'// 偏载误差
     if (res.data && res.data.measureItemDataETwoList && res.data.measureItemDataETwoList.length) {
       originData.value = res.data.measureItemDataETwoList
-      initInputData(res.data.measureItemDataETwoList)
+      initInputData(res.data.measureItemDataETwoList, solveList)
     }
   })
 }
 
-// ----------------------------------------点击保存时校验---------------------------------------
+// ----------------------------------------点击计算时校验---------------------------------------
 const checkoutResult = ref(true)
 // 校验
 const checkout = async (type: string) => {
@@ -500,6 +596,11 @@
     })
   }
   if (type === '6') { // 第6个表格 局部示值误差载荷pt2
+    if (!itemFormData.value.uBValue) {
+      ElMessage.warning('请先填写局部示值误差-Pt1-Ub')
+      checkoutResult.value = false
+      return
+    }
     if (!repeatabilityPt2List.value[0].sValue) {
       ElMessage.warning('请先计算重复性-实验载荷Pt2')
       checkoutResult.value = false
@@ -520,12 +621,31 @@
     })
   }
 }
+
+// 点击保存之前处理参数
+const solveParamsBeforeSave = () => {
+  const tempRepeatabilityPt1List: any = solveParams('1', 'noLoading')// 重复性表格Pt1
+  const tempRepeatabilityPt2List: any = solveParams('2', 'noLoading')// 重复性表格Pt2
+  const tempOffsetErrorPt1List: any = solveParams('3', 'noLoading')// 偏载误差Pt1
+  const tempOffsetErrorPt2List: any = solveParams('4', 'noLoading')// 偏载误差Pt2
+  const tempIndicationErrorPt1List: any = solveParams('5', 'noLoading') // 局部示值误差Pt1
+  const tempIndicationErrorPt2List: any = solveParams('6', 'noLoading')// 局部示值误差Pt2
+  const list = [
+    ...tempRepeatabilityPt1List,
+    ...tempRepeatabilityPt2List,
+    ...tempOffsetErrorPt1List,
+    ...tempOffsetErrorPt2List,
+    ...tempIndicationErrorPt1List,
+    ...tempIndicationErrorPt2List,
+  ]
+  return list
+}
 // -----------------------------------------生成结果处理----------------------------------------
 // 处理计算入参
-const solveParams = (type: string) => {
+function solveParams(type: string, loading: string) {
   let list
   if (type === '1') { // 重复性表格Pt1
-    tableLoading_1.value = true
+    tableLoading_1.value = loading !== 'noLoading'
     list = repeatabilityPt1List.value.map((item) => {
       return {
         ...item,
@@ -539,13 +659,15 @@
         bDeviceNumber: itemFormData.value.bDeviceNumber_1, // 载荷点B器号
         bNominalQualityValue: itemFormData.value.bNominalQualityValue_1, // 载荷点B标称质量值(单位固定g，不存单位)
         bConvertQualityCorrectValue: itemFormData.value.bConvertQualityCorrectValue_1, // 载荷点B折算质量修正值(单位固定mg，不存单位)
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
         ptTwo: '',
         ptTwoUnit: '',
       }
     })
   }
   else if (type === '2') { // 重复性表格Pt2
-    tableLoading_2.value = true
+    tableLoading_2.value = loading !== 'noLoading'
     list = repeatabilityPt2List.value.map((item) => {
       return {
         ...item,
@@ -561,11 +683,13 @@
         bConvertQualityCorrectValue: itemFormData.value.bConvertQualityCorrectValue_2, // 载荷点B折算质量修正值(单位固定mg，不存单位)
         ptOne: '',
         ptOneUnit: '',
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
   else if (type === '3') { // 偏载误差Pt1
-    tableLoading_3.value = true
+    tableLoading_3.value = loading !== 'noLoading'
     list = offsetErrorPt1List.value.map((item) => {
       return {
         ...item,
@@ -583,11 +707,13 @@
         ptTwo: '',
         ptTwoUnit: '',
         loadPointASValue: repeatabilityPt1List.value[0].sValue,
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
   else if (type === '4') { // 偏载误差Pt2
-    tableLoading_4.value = true
+    tableLoading_4.value = loading !== 'noLoading'
     list = offsetErrorPt2List.value.map((item) => {
       return {
         ...item,
@@ -604,11 +730,13 @@
         ptOne: '',
         ptOneUnit: '',
         loadPointBSValue: repeatabilityPt2List.value[0].sValue,
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
   else if (type === '5') { // 局部示值误差Pt1
-    tableLoading_5.value = true
+    tableLoading_5.value = loading !== 'noLoading'
     list = indicationErrorPt1List.value.map((item) => {
       return {
         ...item,
@@ -617,22 +745,19 @@
         aDeviceNumber: itemFormData.value.aDeviceNumber_5, // 载荷点A器号
         aNominalQualityValue: itemFormData.value.aNominalQualityValue_5, // 载荷点A标称质量值(单位固定g，不存单位)
         aConvertQualityCorrectValue: itemFormData.value.aConvertQualityCorrectValue_5, // 载荷点A折算质量修正值(单位固定mg，不存单位)
-        bEquipmentId: itemFormData.value.bEquipmentId_5, // 载荷点B设备id
-        bManufactureNo: itemFormData.value.bManufactureNo_5, // 载荷点B出厂编号
-        bDeviceNumber: itemFormData.value.bDeviceNumber_5, // 载荷点B器号
-        bNominalQualityValue: itemFormData.value.bNominalQualityValue_5, // 载荷点B标称质量值(单位固定g，不存单位)
-        bConvertQualityCorrectValue: itemFormData.value.bConvertQualityCorrectValue_5, // 载荷点B折算质量修正值(单位固定mg，不存单位)
         ptTwo: '',
         ptTwoUnit: '',
         loadPointASValue: repeatabilityPt1List.value[0].sValue, // 重复性的s值
         mSValue: itemFormData.value.mSValue_5, // 标准小砝码ms
         mpesValue: itemFormData.value.mpesValue_5, //	|MPEs|
         uBValue: itemFormData.value.uBValue, // Ub
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
   else if (type === '6') { // 局部示值误差Pt2
-    tableLoading_6.value = true
+    tableLoading_6.value = loading !== 'noLoading'
     list = indicationErrorPt2List.value.map((item) => {
       return {
         ...item,
@@ -644,8 +769,11 @@
         ptOne: '',
         ptOneUnit: '',
         loadPointBSValue: repeatabilityPt2List.value[0].sValue,
-        mSValue: itemFormData.value.mSValue_5, // 标准小砝码ms
-        mpesValue: itemFormData.value.mpesValue_5, //	|MPEs|
+        mSValue: itemFormData.value.mSValue_6, // 标准小砝码ms
+        mpesValue: itemFormData.value.mpesValue_6, //	|MPEs|
+        uBValue: itemFormData.value.uBValue, // Ub
+        actualDivisionValue: itemFormData.value.actualDivisionValue, //		实际分度值d，该参数在结果处理表中每行都要传
+        actualDivisionValueUnit: itemFormData.value.actualDivisionValueUnit, //		实际分度值d单位(固定为mg)，该参数在结果处理表中每行都要传
       }
     })
   }
@@ -656,7 +784,7 @@
 const calculate = (type: string) => {
   checkout(type).then(() => {
     if (!checkoutResult.value) { return false } // 校验
-    const list = solveParams(type) // 处理入参
+    const list = solveParams(type, 'loading') // 处理入参
     const params = {
       belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
       itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
@@ -743,6 +871,19 @@
     switch (type) {
       case '1':
         itemFormData.value.aManufactureNo_1 = measureEquipmentList.value[index].manufactureNo
+
+        // 重复性载荷点A设备变化，偏载误差和局部示值误差跟随改变
+        itemFormData.value.aEquipmentId_2 = itemFormData.value.aEquipmentId_1
+        itemFormData.value.aEquipmentId_3 = itemFormData.value.aEquipmentId_1
+        itemFormData.value.aEquipmentId_4 = itemFormData.value.aEquipmentId_1
+        itemFormData.value.aEquipmentId_5 = itemFormData.value.aEquipmentId_1
+        itemFormData.value.aEquipmentId_6 = itemFormData.value.aEquipmentId_1
+        // 出厂编号同理
+        itemFormData.value.aManufactureNo_2 = itemFormData.value.aManufactureNo_1
+        itemFormData.value.aManufactureNo_3 = itemFormData.value.aManufactureNo_1
+        itemFormData.value.aManufactureNo_4 = itemFormData.value.aManufactureNo_1
+        itemFormData.value.aManufactureNo_5 = itemFormData.value.aManufactureNo_1
+        itemFormData.value.aManufactureNo_6 = itemFormData.value.aManufactureNo_1
         break
       case '2':
         itemFormData.value.aManufactureNo_2 = measureEquipmentList.value[index].manufactureNo
@@ -765,6 +906,32 @@
   }
 }
 
+// 载荷点A器号改变
+const changeADeviceNumber = () => {
+  itemFormData.value.aDeviceNumber_2 = itemFormData.value.aDeviceNumber_1
+  itemFormData.value.aDeviceNumber_3 = itemFormData.value.aDeviceNumber_1
+  itemFormData.value.aDeviceNumber_4 = itemFormData.value.aDeviceNumber_1
+  itemFormData.value.aDeviceNumber_5 = itemFormData.value.aDeviceNumber_1
+  itemFormData.value.aDeviceNumber_6 = itemFormData.value.aDeviceNumber_1
+}
+
+// 载荷点A标称质量值
+const changeANominalQualityValue = () => {
+  itemFormData.value.aNominalQualityValue_2 = itemFormData.value.aNominalQualityValue_1
+  itemFormData.value.aNominalQualityValue_3 = itemFormData.value.aNominalQualityValue_1
+  itemFormData.value.aNominalQualityValue_4 = itemFormData.value.aNominalQualityValue_1
+  itemFormData.value.aNominalQualityValue_5 = itemFormData.value.aNominalQualityValue_1
+  itemFormData.value.aNominalQualityValue_6 = itemFormData.value.aNominalQualityValue_1
+}
+// 载荷点A折算质量修正值
+const changeAConvertQualityCorrectValue = () => {
+  itemFormData.value.aConvertQualityCorrectValue_2 = itemFormData.value.aConvertQualityCorrectValue_1
+  itemFormData.value.aConvertQualityCorrectValue_3 = itemFormData.value.aConvertQualityCorrectValue_1
+  itemFormData.value.aConvertQualityCorrectValue_4 = itemFormData.value.aConvertQualityCorrectValue_1
+  itemFormData.value.aConvertQualityCorrectValue_5 = itemFormData.value.aConvertQualityCorrectValue_1
+  itemFormData.value.aConvertQualityCorrectValue_6 = itemFormData.value.aConvertQualityCorrectValue_1
+}
+
 // 选择载荷点B的设备--处理出厂编号
 const selectEquipmentB = (id: string, type: string) => {
   const index = measureEquipmentList.value.findIndex((item: { id: string }) => item.id === id)
@@ -772,6 +939,16 @@
     switch (type) {
       case '1':
         itemFormData.value.bManufactureNo_1 = measureEquipmentList.value[index].manufactureNo
+
+        // 重复性载荷点B设备变化，偏载误差和局部示值误差跟随改变
+        itemFormData.value.bEquipmentId_2 = itemFormData.value.bEquipmentId_1
+        itemFormData.value.bEquipmentId_3 = itemFormData.value.bEquipmentId_1
+        itemFormData.value.bEquipmentId_4 = itemFormData.value.bEquipmentId_1
+
+        // 出厂编号同理
+        itemFormData.value.bManufactureNo_2 = itemFormData.value.bManufactureNo_1
+        itemFormData.value.bManufactureNo_3 = itemFormData.value.bManufactureNo_1
+        itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1
         break
       case '2':
         itemFormData.value.bManufactureNo_2 = measureEquipmentList.value[index].manufactureNo
@@ -787,6 +964,26 @@
     }
   }
 }
+
+// 载荷点B器号改变
+const changeBDeviceNumber = () => {
+  itemFormData.value.bDeviceNumber_2 = itemFormData.value.bDeviceNumber_1
+  itemFormData.value.bDeviceNumber_3 = itemFormData.value.bDeviceNumber_1
+  itemFormData.value.bDeviceNumber_4 = itemFormData.value.bDeviceNumber_1
+}
+
+// 载荷点B标称质量值
+const changeBNominalQualityValue = () => {
+  itemFormData.value.bNominalQualityValue_2 = itemFormData.value.bNominalQualityValue_1
+  itemFormData.value.bNominalQualityValue_3 = itemFormData.value.bNominalQualityValue_1
+  itemFormData.value.bNominalQualityValue_4 = itemFormData.value.bNominalQualityValue_1
+}
+// 载荷点B折算质量修正值
+const changeBConvertQualityCorrectValue = () => {
+  itemFormData.value.bConvertQualityCorrectValue_2 = itemFormData.value.bConvertQualityCorrectValue_1
+  itemFormData.value.bConvertQualityCorrectValue_3 = itemFormData.value.bConvertQualityCorrectValue_1
+  itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1
+}
 // ------------------------------------------钩子----------------------------------------------
 
 watch(() => props.infoId, (newValue) => {
@@ -796,81 +993,76 @@
 }, { immediate: true })
 
 // 监听重复性的载荷点A和载荷点B的数据，默认填充偏载误差和局部误差的相应数据
-watch(
-  [
-    () => itemFormData.value.aEquipmentId_1, // 设备
-    () => itemFormData.value.aDeviceNumber_1, // 器号
-    () => itemFormData.value.aNominalQualityValue_1, // 标称质量值
-    () => itemFormData.value.aConvertQualityCorrectValue_1, // 折算质量修正值
-    () => itemFormData.value.aManufactureNo_2, // 载荷点A出厂编号
-    () => itemFormData.value.bEquipmentId_1,
-    () => itemFormData.value.bDeviceNumber_1,
-    () => itemFormData.value.bNominalQualityValue_1,
-    () => itemFormData.value.bConvertQualityCorrectValue_1,
-    () => itemFormData.value.bManufactureNo_4, // 载荷点B出厂编号
-  ], (newValue: any) => {
-    console.log('监听数据', newValue)
-    // 载荷点A设备
-    if (!itemFormData.value.aEquipmentId_2) { itemFormData.value.aEquipmentId_2 = itemFormData.value.aEquipmentId_1 }
-    if (!itemFormData.value.aEquipmentId_3) { itemFormData.value.aEquipmentId_3 = itemFormData.value.aEquipmentId_1 }
-    if (!itemFormData.value.aEquipmentId_4) { itemFormData.value.aEquipmentId_4 = itemFormData.value.aEquipmentId_1 }
-    if (!itemFormData.value.aEquipmentId_5) { itemFormData.value.aEquipmentId_5 = itemFormData.value.aEquipmentId_1 }
-    if (!itemFormData.value.aEquipmentId_6) { itemFormData.value.aEquipmentId_6 = itemFormData.value.aEquipmentId_1 }
-    // 载荷点A器号
-    if (!itemFormData.value.aDeviceNumber_2) { itemFormData.value.aDeviceNumber_2 = itemFormData.value.aDeviceNumber_1 }
-    if (!itemFormData.value.aDeviceNumber_3) { itemFormData.value.aDeviceNumber_3 = itemFormData.value.aDeviceNumber_1 }
-    if (!itemFormData.value.aDeviceNumber_4) { itemFormData.value.aDeviceNumber_4 = itemFormData.value.aDeviceNumber_1 }
-    if (!itemFormData.value.aDeviceNumber_5) { itemFormData.value.aDeviceNumber_5 = itemFormData.value.aDeviceNumber_1 }
-    if (!itemFormData.value.aDeviceNumber_6) { itemFormData.value.aDeviceNumber_6 = itemFormData.value.aDeviceNumber_1 }
-    // 载荷点A标称质量值
-    if (!itemFormData.value.aNominalQualityValue_2) { itemFormData.value.aNominalQualityValue_2 = itemFormData.value.aNominalQualityValue_1 }
-    if (!itemFormData.value.aNominalQualityValue_3) { itemFormData.value.aNominalQualityValue_3 = itemFormData.value.aNominalQualityValue_1 }
-    if (!itemFormData.value.aNominalQualityValue_4) { itemFormData.value.aNominalQualityValue_4 = itemFormData.value.aNominalQualityValue_1 }
-    if (!itemFormData.value.aNominalQualityValue_5) { itemFormData.value.aNominalQualityValue_5 = itemFormData.value.aNominalQualityValue_1 }
-    if (!itemFormData.value.aNominalQualityValue_6) { itemFormData.value.aNominalQualityValue_6 = itemFormData.value.aNominalQualityValue_1 }
+// watch(
+//   [
+//     () => itemFormData.value.aEquipmentId_1, // 设备
+//     () => itemFormData.value.aDeviceNumber_1, // 器号
+//     () => itemFormData.value.aNominalQualityValue_1, // 标称质量值
+//     () => itemFormData.value.aConvertQualityCorrectValue_1, // 折算质量修正值
+//     () => itemFormData.value.aManufactureNo_1, // 载荷点A出厂编号
+//     () => itemFormData.value.bEquipmentId_1,
+//     () => itemFormData.value.bDeviceNumber_1,
+//     () => itemFormData.value.bNominalQualityValue_1,
+//     () => itemFormData.value.bConvertQualityCorrectValue_1,
+//     () => itemFormData.value.bManufactureNo_1, // 载荷点B出厂编号
+//   ], (newValue: any) => {
+//     console.log('监听数据', newValue)
+//     // 载荷点A设备
+//     itemFormData.value.aEquipmentId_2 = itemFormData.value.aEquipmentId_1
+//     itemFormData.value.aEquipmentId_3 = itemFormData.value.aEquipmentId_1
+//     itemFormData.value.aEquipmentId_4 = itemFormData.value.aEquipmentId_1
+//     itemFormData.value.aEquipmentId_5 = itemFormData.value.aEquipmentId_1
+//     itemFormData.value.aEquipmentId_6 = itemFormData.value.aEquipmentId_1
+//     // 载荷点A器号
+//     itemFormData.value.aDeviceNumber_2 = itemFormData.value.aDeviceNumber_1
+//     itemFormData.value.aDeviceNumber_3 = itemFormData.value.aDeviceNumber_1
+//     itemFormData.value.aDeviceNumber_4 = itemFormData.value.aDeviceNumber_1
+//     itemFormData.value.aDeviceNumber_5 = itemFormData.value.aDeviceNumber_1
+//     itemFormData.value.aDeviceNumber_6 = itemFormData.value.aDeviceNumber_1
+//     // 载荷点A标称质量值
+//     itemFormData.value.aNominalQualityValue_2 = itemFormData.value.aNominalQualityValue_1
+//     itemFormData.value.aNominalQualityValue_3 = itemFormData.value.aNominalQualityValue_1
+//     itemFormData.value.aNominalQualityValue_4 = itemFormData.value.aNominalQualityValue_1
+//     itemFormData.value.aNominalQualityValue_5 = itemFormData.value.aNominalQualityValue_1
+//     itemFormData.value.aNominalQualityValue_6 = itemFormData.value.aNominalQualityValue_1
 
-    // 载荷点A折算质量修正值
-    if (!itemFormData.value.aConvertQualityCorrectValue_2) { itemFormData.value.aConvertQualityCorrectValue_2 = itemFormData.value.aConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.aConvertQualityCorrectValue_3) { itemFormData.value.aConvertQualityCorrectValue_3 = itemFormData.value.aConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.aConvertQualityCorrectValue_4) { itemFormData.value.aConvertQualityCorrectValue_4 = itemFormData.value.aConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.aConvertQualityCorrectValue_5) { itemFormData.value.aConvertQualityCorrectValue_5 = itemFormData.value.aConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.aConvertQualityCorrectValue_6) { itemFormData.value.aConvertQualityCorrectValue_6 = itemFormData.value.aConvertQualityCorrectValue_1 }
+//     // 载荷点A折算质量修正值
+//     itemFormData.value.aConvertQualityCorrectValue_2 = itemFormData.value.aConvertQualityCorrectValue_1
+//     itemFormData.value.aConvertQualityCorrectValue_3 = itemFormData.value.aConvertQualityCorrectValue_1
+//     itemFormData.value.aConvertQualityCorrectValue_4 = itemFormData.value.aConvertQualityCorrectValue_1
+//     itemFormData.value.aConvertQualityCorrectValue_5 = itemFormData.value.aConvertQualityCorrectValue_1
+//     itemFormData.value.aConvertQualityCorrectValue_6 = itemFormData.value.aConvertQualityCorrectValue_1
 
-    // 载荷点A出厂编号
-    if (!itemFormData.value.aManufactureNo_2) { itemFormData.value.aManufactureNo_2 = itemFormData.value.aManufactureNo_1 }
-    if (!itemFormData.value.aManufactureNo_3) { itemFormData.value.aManufactureNo_3 = itemFormData.value.aManufactureNo_1 }
-    if (!itemFormData.value.aManufactureNo_4) { itemFormData.value.aManufactureNo_4 = itemFormData.value.aManufactureNo_1 }
-    if (!itemFormData.value.aManufactureNo_5) { itemFormData.value.aManufactureNo_5 = itemFormData.value.aManufactureNo_1 }
-    if (!itemFormData.value.aManufactureNo_6) { itemFormData.value.aManufactureNo_6 = itemFormData.value.aManufactureNo_1 }
+//     // 载荷点A出厂编号
+//     itemFormData.value.aManufactureNo_2 = itemFormData.value.aManufactureNo_1
+//     itemFormData.value.aManufactureNo_3 = itemFormData.value.aManufactureNo_1
+//     itemFormData.value.aManufactureNo_4 = itemFormData.value.aManufactureNo_1
+//     itemFormData.value.aManufactureNo_5 = itemFormData.value.aManufactureNo_1
+//     itemFormData.value.aManufactureNo_6 = itemFormData.value.aManufactureNo_1
 
-    // 载荷点B设备
-    if (!itemFormData.value.bEquipmentId_2) { itemFormData.value.bEquipmentId_2 = itemFormData.value.bEquipmentId_1 }
-    if (!itemFormData.value.bEquipmentId_3) { itemFormData.value.bEquipmentId_3 = itemFormData.value.bEquipmentId_1 }
-    if (!itemFormData.value.bEquipmentId_4) { itemFormData.value.bEquipmentId_4 = itemFormData.value.bEquipmentId_1 }
-    if (!itemFormData.value.bEquipmentId_5) { itemFormData.value.bEquipmentId_5 = itemFormData.value.bEquipmentId_1 }
-    // 载荷点B器号
-    if (!itemFormData.value.bDeviceNumber_2) { itemFormData.value.bDeviceNumber_2 = itemFormData.value.bDeviceNumber_1 }
-    if (!itemFormData.value.bDeviceNumber_3) { itemFormData.value.bDeviceNumber_3 = itemFormData.value.bDeviceNumber_1 }
-    if (!itemFormData.value.bDeviceNumber_4) { itemFormData.value.bDeviceNumber_4 = itemFormData.value.bDeviceNumber_1 }
-    if (!itemFormData.value.bDeviceNumber_5) { itemFormData.value.bDeviceNumber_5 = itemFormData.value.bDeviceNumber_1 }
-    // 载荷点B标称质量值
-    if (!itemFormData.value.bNominalQualityValue_2) { itemFormData.value.bNominalQualityValue_2 = itemFormData.value.bNominalQualityValue_1 }
-    if (!itemFormData.value.bNominalQualityValue_3) { itemFormData.value.bNominalQualityValue_3 = itemFormData.value.bNominalQualityValue_1 }
-    if (!itemFormData.value.bNominalQualityValue_4) { itemFormData.value.bNominalQualityValue_4 = itemFormData.value.bNominalQualityValue_1 }
-    if (!itemFormData.value.bNominalQualityValue_5) { itemFormData.value.bNominalQualityValue_5 = itemFormData.value.bNominalQualityValue_1 }
+//     // 载荷点B设备
+//     itemFormData.value.bEquipmentId_2 = itemFormData.value.bEquipmentId_1
+//     itemFormData.value.bEquipmentId_3 = itemFormData.value.bEquipmentId_1
+//     itemFormData.value.bEquipmentId_4 = itemFormData.value.bEquipmentId_1
+//     // 载荷点B器号
+//     itemFormData.value.bDeviceNumber_2 = itemFormData.value.bDeviceNumber_1
+//     itemFormData.value.bDeviceNumber_3 = itemFormData.value.bDeviceNumber_1
+//     itemFormData.value.bDeviceNumber_4 = itemFormData.value.bDeviceNumber_1
+//     // 载荷点B标称质量值
+//     itemFormData.value.bNominalQualityValue_2 = itemFormData.value.bNominalQualityValue_1
+//     itemFormData.value.bNominalQualityValue_3 = itemFormData.value.bNominalQualityValue_1
+//     itemFormData.value.bNominalQualityValue_4 = itemFormData.value.bNominalQualityValue_1
 
-    // 载荷点B折算质量修正值
-    if (!itemFormData.value.bConvertQualityCorrectValue_2) { itemFormData.value.bConvertQualityCorrectValue_2 = itemFormData.value.bConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.bConvertQualityCorrectValue_3) { itemFormData.value.bConvertQualityCorrectValue_3 = itemFormData.value.bConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.bConvertQualityCorrectValue_4) { itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1 }
-    if (!itemFormData.value.bConvertQualityCorrectValue_5) { itemFormData.value.bConvertQualityCorrectValue_5 = itemFormData.value.bConvertQualityCorrectValue_1 }
+//     // 载荷点B折算质量修正值
+//     itemFormData.value.bConvertQualityCorrectValue_2 = itemFormData.value.bConvertQualityCorrectValue_1
+//     itemFormData.value.bConvertQualityCorrectValue_3 = itemFormData.value.bConvertQualityCorrectValue_1
+//     itemFormData.value.bConvertQualityCorrectValue_4 = itemFormData.value.bConvertQualityCorrectValue_1
 
-    // 载荷点B出厂编号
-    if (!itemFormData.value.bManufactureNo_2) { itemFormData.value.bManufactureNo_2 = itemFormData.value.bManufactureNo_1 }
-    if (!itemFormData.value.bManufactureNo_3) { itemFormData.value.bManufactureNo_3 = itemFormData.value.bManufactureNo_1 }
-    if (!itemFormData.value.bManufactureNo_4) { itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1 }
-    if (!itemFormData.value.bManufactureNo_5) { itemFormData.value.bManufactureNo_5 = itemFormData.value.bManufactureNo_1 }
-  }, { deep: true, immediate: true })
+//     // 载荷点B出厂编号
+//     itemFormData.value.bManufactureNo_2 = itemFormData.value.bManufactureNo_1
+//     itemFormData.value.bManufactureNo_3 = itemFormData.value.bManufactureNo_1
+//     itemFormData.value.bManufactureNo_4 = itemFormData.value.bManufactureNo_1
+//   }, { deep: true, immediate: true })
 
 onMounted(() => {
   if (pageType.value === 'add') { // 从我的任务跳转过来（新增）
@@ -887,11 +1079,13 @@
     itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id
     itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code
     itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称
-    // fetchInfo()
+    // 查输入值(查检定项管理的详情)
+    fetchItemInfo($route.query.itemId! as string, $route.query.itemCategoryName! as string, $route.query.belongStandardEquipment as string, false)
+    fetchInfo()
   }
 })
 
-defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType })
+defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType, solveParamsBeforeSave })
 </script>
 
 <template>
@@ -987,6 +1181,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '器号'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeADeviceNumber"
                 />
               </el-form-item>
               <el-form-item label-width="10px" prop="aNominalQualityValue_1">
@@ -995,6 +1190,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '标称质量值'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeANominalQualityValue"
                 />
               </el-form-item>g
               <el-form-item label-width="10px" prop="aConvertQualityCorrectValue_1">
@@ -1003,6 +1199,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '折算质量修正值'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeAConvertQualityCorrectValue"
                 />
               </el-form-item>mg
             </el-col>
@@ -1022,6 +1219,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '器号'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeBDeviceNumber"
                 />
               </el-form-item>
               <el-form-item label-width="10px" prop="bNominalQualityValue_1">
@@ -1030,6 +1228,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '标称质量值'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeBNominalQualityValue"
                 />
               </el-form-item>g
               <el-form-item label-width="10px" prop="bConvertQualityCorrectValue_1">
@@ -1038,6 +1237,7 @@
                   class="full-width-input"
                   :placeholder="pageType === 'detail' ? ' ' : '折算质量修正值'"
                   :disabled="pageType === 'detail' || itemFormData.appearance === '0'"
+                  @change="changeBConvertQualityCorrectValue"
                 />
               </el-form-item>mg
             </el-col>
@@ -1156,7 +1356,7 @@
           </span>
           <!-- 实验载荷Pt2  -->
           <span style="color: #606266;font-size: 14px;margin-left: 10px;white-space: nowrap;">
-            实验载荷Pt2: {{ itemFormData.ptTwo }}{{ itemFormData.ptTwoUnit }}
+            实验载荷Pt1: {{ itemFormData.ptOne }}{{ itemFormData.ptOneUnit }}
           </span>
           <!-- 秤量盘形式 -->
           <span style="color: #606266;font-size: 15px;white-space: nowrap;margin-left: 20px;margin-right: 10px;">秤量盘形式:</span>
@@ -1380,7 +1580,7 @@
             <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-option v-for="item in measureEquipmentList" :key="item.id" :disabled="item.id === itemFormData.bEquipmentId_5" :label="item.manufactureNo" :value="item.id">
+                  <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>
                   </el-option>
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index 4aad7ef..f90f120 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -177,6 +177,24 @@
       itemCategoryId: itemCategoryId.value, // 检定项分类id
     }
   }
+  else if (belongStandardEquipment.value === '8') { // 第8套 E2等砝码
+    const list = templateDetailRef.value.solveParamsBeforeSave()
+    params = {
+      ...templateDetailRef.value.itemFormData,
+      measureDataETwoList: list,
+      id: pageType.value === 'edit' ? infoId.value : '',
+      equipmentIds: templateDetailRef.value.templateFormAndTableRef.measureEquipmentList.map((item: { id: string }) => item.id),
+      belongStandardEquipment: belongStandardEquipment.value, // 标准装置code
+      belongStandardEquipmentName: belongStandardEquipmentName.value, // 标准装置名称
+      model: templateDetailRef.value.templateFormAndTableRef.sampleList[0].sampleModel, // 型号
+      ...templateDetailRef.value.templateFormAndTableRef.form,
+      sampleId: templateDetailRef.value.templateFormAndTableRef.sampleList[0].sampleId,
+      sampleName: templateDetailRef.value.templateFormAndTableRef.sampleList[0].sampleName,
+      manufactureNo: templateDetailRef.value.templateFormAndTableRef.sampleList[0].manufactureNo,
+      itemCategoryName: itemCategoryName.value, // 检定项分类名称
+      itemCategoryId: itemCategoryId.value, // 检定项分类id
+    }
+  }
   return params
 }
 
@@ -192,6 +210,9 @@
   else if (belongStandardEquipment.value === '3' || belongStandardEquipment.value === '4' || belongStandardEquipment.value === '5' || belongStandardEquipment.value === '6') {
     return templateDetailRef.value.checkout() && templateDetailRef.value.templateFormAndTableRef.checkout()
   }
+  else if (belongStandardEquipment.value === '8') { // 第8套 E2等砝码
+    return templateDetailRef.value.templateFormAndTableRef.checkout()
+  }
 }
 
 // 保存