diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue
index 384e7f1..ae07943 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue
@@ -206,10 +206,13 @@
- {{ scope.row.verticalScaleGearUnit }}
+ {{ scope.row.verticalScaleGearUnit || (item.value === 'measureValue' && scope.row.measureValueUnit) }}
-
+
+ {{ scope.row.technicalIndexUnit || (item.value === 'measureValue' && scope.row.measureValueUnit) }}
+
+
{{ scope.row.technicalIndexUnit }}
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue
index 384e7f1..ae07943 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue
@@ -206,10 +206,13 @@
- {{ scope.row.verticalScaleGearUnit }}
+ {{ scope.row.verticalScaleGearUnit || (item.value === 'measureValue' && scope.row.measureValueUnit) }}
-
+
+ {{ scope.row.technicalIndexUnit || (item.value === 'measureValue' && scope.row.measureValueUnit) }}
+
+
{{ scope.row.technicalIndexUnit }}
diff --git a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue
index 9ba4023..44b3dfc 100644
--- a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue
@@ -1310,6 +1310,7 @@
checkPointDefineFront: tempCheckPoint, // 核查点
editable: props.pageType !== 'detail',
technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit,
+ maximumErrorAbsoluteDefineFront: item.maximumErrorAbsolute + item.maximumErrorAbsoluteUnit,
}
})
@@ -1394,6 +1395,7 @@
testValueNine: item.checkType === '稳定性' ? item.testValueNine : (item.checkType === '重复性' && `${item.testValueNine}` === '') ? undefined : Number(item.testValueNine), // 测量值9
testValueTen: item.checkType === '稳定性' ? item.testValueTen : (item.checkType === '重复性' && `${item.testValueTen}` === '') ? undefined : Number(item.testValueTen), // 测量值10
technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标
+ maximumErrorAbsoluteDefineFront: item.maximumErrorAbsolute + item.maximumErrorAbsoluteUnit,
}
})
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue
index 384e7f1..ae07943 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue
@@ -206,10 +206,13 @@
- {{ scope.row.verticalScaleGearUnit }}
+ {{ scope.row.verticalScaleGearUnit || (item.value === 'measureValue' && scope.row.measureValueUnit) }}
-
+
+ {{ scope.row.technicalIndexUnit || (item.value === 'measureValue' && scope.row.measureValueUnit) }}
+
+
{{ scope.row.technicalIndexUnit }}
diff --git a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue
index 9ba4023..44b3dfc 100644
--- a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue
@@ -1310,6 +1310,7 @@
checkPointDefineFront: tempCheckPoint, // 核查点
editable: props.pageType !== 'detail',
technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit,
+ maximumErrorAbsoluteDefineFront: item.maximumErrorAbsolute + item.maximumErrorAbsoluteUnit,
}
})
@@ -1394,6 +1395,7 @@
testValueNine: item.checkType === '稳定性' ? item.testValueNine : (item.checkType === '重复性' && `${item.testValueNine}` === '') ? undefined : Number(item.testValueNine), // 测量值9
testValueTen: item.checkType === '稳定性' ? item.testValueTen : (item.checkType === '重复性' && `${item.testValueTen}` === '') ? undefined : Number(item.testValueTen), // 测量值10
technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标
+ maximumErrorAbsoluteDefineFront: item.maximumErrorAbsolute + item.maximumErrorAbsoluteUnit,
}
})
diff --git a/src/views/workbench/approve/useChangePage.ts b/src/views/workbench/approve/useChangePage.ts
index eeb376d..ca756b5 100644
--- a/src/views/workbench/approve/useChangePage.ts
+++ b/src/views/workbench/approve/useChangePage.ts
@@ -44,6 +44,7 @@
taskId: row.taskId, // 任务id
fromPage: 'workBench',
approvalStatus,
+ decisionItem: row.decisionItem,
},
})
}
@@ -67,6 +68,7 @@
taskId: row.taskId, // 任务id
fromPage: 'workBench',
approvalStatus,
+ decisionItem: row.decisionItem,
},
})
})
@@ -87,6 +89,7 @@
status: approvalStatus, // 资源管理需要此字段判断审批按钮是否展示
approvalStatus,
fromWorkBench: 'approval',
+ decisionItem: row.decisionItem,
},
})
}