diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f8b0e7a..6214d1c 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -265,11 +265,6 @@
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f8b0e7a..6214d1c 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -265,11 +265,6 @@
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 0c1dd1a..ccc9427 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -506,5 +506,10 @@
font-weight: bold;
line-height: 19px;
}
+
+ .el-radio__label {
+ display: block !important;
+ }
}
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f8b0e7a..6214d1c 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -265,11 +265,6 @@
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 0c1dd1a..ccc9427 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -506,5 +506,10 @@
font-weight: bold;
line-height: 19px;
}
+
+ .el-radio__label {
+ display: block !important;
+ }
}
+
diff --git a/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue
new file mode 100644
index 0000000..52affc9
--- /dev/null
+++ b/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue
@@ -0,0 +1,375 @@
+
+
+
+
+
+
+
+
+ 生成结果处理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f8b0e7a..6214d1c 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -265,11 +265,6 @@
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 0c1dd1a..ccc9427 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -506,5 +506,10 @@
font-weight: bold;
line-height: 19px;
}
+
+ .el-radio__label {
+ display: block !important;
+ }
}
+
diff --git a/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue
new file mode 100644
index 0000000..52affc9
--- /dev/null
+++ b/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue
@@ -0,0 +1,375 @@
+
+
+
+
+
+
+
+
+ 生成结果处理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/equipement/standard/checkData/components/fourth/fourth-interface.ts b/src/views/equipement/standard/checkData/components/fourth/fourth-interface.ts
new file mode 100644
index 0000000..db43dd5
--- /dev/null
+++ b/src/views/equipement/standard/checkData/components/fourth/fourth-interface.ts
@@ -0,0 +1,31 @@
+export interface IList {
+ averageValue: string // 平均值
+ checkPoint: string // 核查点
+ dataId: string // 核查数据管理基础信息表id
+ firstForwardStroke: string // 第一次正行程
+ firstReverseStroke: string // 第一次反行程
+ id: string // id,更新/删除使用参数
+ maxIndicatingError: string // 示值误差最大值
+ maxReturnError: string // 回程误差最大值
+ maximumError: string // 最大允许误差
+ measureValueFive: string // 测量标准示值5
+ measureValueFour: string // 测量标准示值4
+ measureValueOne: string // 测量标准示值1
+ measureValueSix: string // 测量标准示值6
+ measureValueThree: string // 测量标准示值3
+ measureValueTwo: string // 测量标准示值2
+ measureValueAverage: string // 测量标准示值平均值
+ params: string // 核查项目(直接存字典value)
+ secondForwardStroke: string // 第二次正行程
+ secondReverseStroke: string // 第二次反行程
+ testValueFive: string // 核查标准示值5
+ testValueFour: string // 核查标准示值4
+ testValueOne: string // 核查标准示值1
+ testValueSix: string // 核查标准示值6
+ testValueThree: string // 核查标准示值3
+ testValueTwo: string // 核查标准示值2
+ testValueAverage: string // 核查标准示值平均值
+ thirdForwardStroke: string // 第三次正行程
+ thirdReverseStroke: string // 第三次反行程
+ unit: string // 单位(直接存字典value)
+}
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f8b0e7a..6214d1c 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -265,11 +265,6 @@
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 0c1dd1a..ccc9427 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -506,5 +506,10 @@
font-weight: bold;
line-height: 19px;
}
+
+ .el-radio__label {
+ display: block !important;
+ }
}
+
diff --git a/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue
new file mode 100644
index 0000000..52affc9
--- /dev/null
+++ b/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue
@@ -0,0 +1,375 @@
+
+
+
+
+
+
+
+
+ 生成结果处理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/equipement/standard/checkData/components/fourth/fourth-interface.ts b/src/views/equipement/standard/checkData/components/fourth/fourth-interface.ts
new file mode 100644
index 0000000..db43dd5
--- /dev/null
+++ b/src/views/equipement/standard/checkData/components/fourth/fourth-interface.ts
@@ -0,0 +1,31 @@
+export interface IList {
+ averageValue: string // 平均值
+ checkPoint: string // 核查点
+ dataId: string // 核查数据管理基础信息表id
+ firstForwardStroke: string // 第一次正行程
+ firstReverseStroke: string // 第一次反行程
+ id: string // id,更新/删除使用参数
+ maxIndicatingError: string // 示值误差最大值
+ maxReturnError: string // 回程误差最大值
+ maximumError: string // 最大允许误差
+ measureValueFive: string // 测量标准示值5
+ measureValueFour: string // 测量标准示值4
+ measureValueOne: string // 测量标准示值1
+ measureValueSix: string // 测量标准示值6
+ measureValueThree: string // 测量标准示值3
+ measureValueTwo: string // 测量标准示值2
+ measureValueAverage: string // 测量标准示值平均值
+ params: string // 核查项目(直接存字典value)
+ secondForwardStroke: string // 第二次正行程
+ secondReverseStroke: string // 第二次反行程
+ testValueFive: string // 核查标准示值5
+ testValueFour: string // 核查标准示值4
+ testValueOne: string // 核查标准示值1
+ testValueSix: string // 核查标准示值6
+ testValueThree: string // 核查标准示值3
+ testValueTwo: string // 核查标准示值2
+ testValueAverage: string // 核查标准示值平均值
+ thirdForwardStroke: string // 第三次正行程
+ thirdReverseStroke: string // 第三次反行程
+ unit: string // 单位(直接存字典value)
+}
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index e4e40a4..9bbf7d5 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -7,6 +7,7 @@
import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
import saveCheckRecord from './dialog/saveCheckRecord.vue'
import checkDataFirst from './components/first/checkDataCom.vue'
+import checkDataFourth from './components/fourth/checkDataCom.vue'
import type { TableColumn } from '@/components/NormalTable/table_interface'
import useUserStore from '@/store/modules/user'
import { getDictByCode } from '@/api/system/dict'
@@ -205,7 +206,9 @@
itemCategoryId: val[0].itemCategoryId, // 核查项分类id
itemCategoryName: val[0].itemCategoryName, // 核查项分类名称
}]
- checkDataFirstRef.value.fetchCheckItemDetail(val[0].id, belongStandardEquipment.value, itemCategoryId.value, itemCategoryName.value) // 获取核查数据
+ nextTick(() => {
+ checkDataFirstRef.value.fetchCheckItemDetail(val[0].id, belongStandardEquipment.value, itemCategoryId.value, itemCategoryName.value) // 获取核查数据
+ })
}
// -------------------------------------------表单--请求核查依据(作业指导书)----------------------------------------
@@ -256,6 +259,24 @@
belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置
}
}
+ else if (belongStandardEquipment.value === '4') {
+ params = {
+ ...form.value,
+ ...checkDataFirstRef.value.form,
+ checkAccord: technologyFile.value.join(','), // 核查依据
+ checkDataPistonGaugeList: checkDataFirstRef.value.list, // 核查数据
+ checkEquipmentIdList: equipmentList.value.map(item => item.id), // 核查标准设备
+ equipmentId: chekedEquipmentList.value[0].equipmentId, // 被核查标准设备id
+ createUserId: user.id, // 核查员id
+ createUserName: user.name, // 核查员
+ // temperature: Number(form.value.temperature), // 环境温度
+ // humidity: Number(form.value.humidity), // 环境湿度
+ itemCategoryId: chekedEquipmentList.value[0].itemCategoryId, // 核查项分类id
+ standardEquipmentId: selectStandardId.value, // 被核查标准装置id
+ id: infoId.value,
+ belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置
+ }
+ }
return params
}
@@ -367,6 +388,8 @@
})
onMounted(async () => {
belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置
+ itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id
+ itemCategoryName.value = $route.query.itemCategoryName as string // 核查项分类名称
getDict()
if (pageType.value === 'add') {
form.value.createUserName = user.name // 核查员
@@ -479,9 +502,9 @@
-
+
- 无
+ 无
@@ -546,11 +569,10 @@
-
-
-
+
+
+
+
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index f8b0e7a..6214d1c 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -265,11 +265,6 @@
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 0c1dd1a..ccc9427 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -506,5 +506,10 @@
font-weight: bold;
line-height: 19px;
}
+
+ .el-radio__label {
+ display: block !important;
+ }
}
+
diff --git a/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue
new file mode 100644
index 0000000..52affc9
--- /dev/null
+++ b/src/views/equipement/standard/checkData/components/fourth/checkDataCom.vue
@@ -0,0 +1,375 @@
+
+
+
+
+
+
+
+
+ 生成结果处理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/equipement/standard/checkData/components/fourth/fourth-interface.ts b/src/views/equipement/standard/checkData/components/fourth/fourth-interface.ts
new file mode 100644
index 0000000..db43dd5
--- /dev/null
+++ b/src/views/equipement/standard/checkData/components/fourth/fourth-interface.ts
@@ -0,0 +1,31 @@
+export interface IList {
+ averageValue: string // 平均值
+ checkPoint: string // 核查点
+ dataId: string // 核查数据管理基础信息表id
+ firstForwardStroke: string // 第一次正行程
+ firstReverseStroke: string // 第一次反行程
+ id: string // id,更新/删除使用参数
+ maxIndicatingError: string // 示值误差最大值
+ maxReturnError: string // 回程误差最大值
+ maximumError: string // 最大允许误差
+ measureValueFive: string // 测量标准示值5
+ measureValueFour: string // 测量标准示值4
+ measureValueOne: string // 测量标准示值1
+ measureValueSix: string // 测量标准示值6
+ measureValueThree: string // 测量标准示值3
+ measureValueTwo: string // 测量标准示值2
+ measureValueAverage: string // 测量标准示值平均值
+ params: string // 核查项目(直接存字典value)
+ secondForwardStroke: string // 第二次正行程
+ secondReverseStroke: string // 第二次反行程
+ testValueFive: string // 核查标准示值5
+ testValueFour: string // 核查标准示值4
+ testValueOne: string // 核查标准示值1
+ testValueSix: string // 核查标准示值6
+ testValueThree: string // 核查标准示值3
+ testValueTwo: string // 核查标准示值2
+ testValueAverage: string // 核查标准示值平均值
+ thirdForwardStroke: string // 第三次正行程
+ thirdReverseStroke: string // 第三次反行程
+ unit: string // 单位(直接存字典value)
+}
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index e4e40a4..9bbf7d5 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -7,6 +7,7 @@
import selectStandardEquipmentDialog from './dialog/selectStandardEquipmentDialog.vue'
import saveCheckRecord from './dialog/saveCheckRecord.vue'
import checkDataFirst from './components/first/checkDataCom.vue'
+import checkDataFourth from './components/fourth/checkDataCom.vue'
import type { TableColumn } from '@/components/NormalTable/table_interface'
import useUserStore from '@/store/modules/user'
import { getDictByCode } from '@/api/system/dict'
@@ -205,7 +206,9 @@
itemCategoryId: val[0].itemCategoryId, // 核查项分类id
itemCategoryName: val[0].itemCategoryName, // 核查项分类名称
}]
- checkDataFirstRef.value.fetchCheckItemDetail(val[0].id, belongStandardEquipment.value, itemCategoryId.value, itemCategoryName.value) // 获取核查数据
+ nextTick(() => {
+ checkDataFirstRef.value.fetchCheckItemDetail(val[0].id, belongStandardEquipment.value, itemCategoryId.value, itemCategoryName.value) // 获取核查数据
+ })
}
// -------------------------------------------表单--请求核查依据(作业指导书)----------------------------------------
@@ -256,6 +259,24 @@
belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置
}
}
+ else if (belongStandardEquipment.value === '4') {
+ params = {
+ ...form.value,
+ ...checkDataFirstRef.value.form,
+ checkAccord: technologyFile.value.join(','), // 核查依据
+ checkDataPistonGaugeList: checkDataFirstRef.value.list, // 核查数据
+ checkEquipmentIdList: equipmentList.value.map(item => item.id), // 核查标准设备
+ equipmentId: chekedEquipmentList.value[0].equipmentId, // 被核查标准设备id
+ createUserId: user.id, // 核查员id
+ createUserName: user.name, // 核查员
+ // temperature: Number(form.value.temperature), // 环境温度
+ // humidity: Number(form.value.humidity), // 环境湿度
+ itemCategoryId: chekedEquipmentList.value[0].itemCategoryId, // 核查项分类id
+ standardEquipmentId: selectStandardId.value, // 被核查标准装置id
+ id: infoId.value,
+ belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置
+ }
+ }
return params
}
@@ -367,6 +388,8 @@
})
onMounted(async () => {
belongStandardEquipment.value = $route.query.belongStandardEquipment as string // 检校标准装置
+ itemCategoryId.value = $route.query.itemCategoryId as string // 核查项分类id
+ itemCategoryName.value = $route.query.itemCategoryName as string // 核查项分类名称
getDict()
if (pageType.value === 'add') {
form.value.createUserName = user.name // 核查员
@@ -479,9 +502,9 @@
-
+
- 无
+ 无
@@ -546,11 +569,10 @@
-
-
-
+
+
+
+
diff --git a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
index 5a9ac3b..f43a868 100644
--- a/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standard/checkData/dialog/selectStandardEquipmentDialog.vue
@@ -76,7 +76,8 @@
{ text: '统一编号', value: 'equipmentNo', align: 'center', required: true },
{ text: '计量标准的主标准器及配套设备名称', value: 'equipmentName', align: 'center' },
{ text: '型号规格', value: 'model', align: 'center' },
- { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+ { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+ { text: '生产厂家', value: 'manufacturer', align: 'center' },
{ text: '测量范围', value: 'measureRange', align: 'center' },
{ text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
{ text: '核查项分类名称', value: 'itemCategoryName', align: 'center' },