|
|
@@ -162,7 +162,7 @@ const tableColumn = ref([
|
|
|
{ key: 'userName', name: '取样人', align: 'center' },
|
|
|
{ key: 'createTime', name: '创建试验时间', align: 'center' },
|
|
|
{ key: 'entrustStatus', name: '报告状态', align: 'center' },
|
|
|
- { key: 'action', name: '操作', width: 120, align: 'center' },
|
|
|
+ { key: 'action', name: '操作', width: 120, align: 'center', fixed: 'right' },
|
|
|
])
|
|
|
const tableData = ref([])
|
|
|
|
|
|
@@ -294,7 +294,7 @@ const sampleRemoveApi = async (ids) => {
|
|
|
}
|
|
|
|
|
|
//填写报告
|
|
|
-const fillReportClick = (row) => {
|
|
|
+const fillReportClick = ({ testId }) => {
|
|
|
const { contractType } = contractInfo.value
|
|
|
const { primaryKeyId } = treeInfo.value
|
|
|
router.push({
|
|
|
@@ -302,7 +302,7 @@ const fillReportClick = (row) => {
|
|
|
query: {
|
|
|
nodeId: primaryKeyId || '',
|
|
|
dataType: contractType > 0 ? contractType + '' : '1',
|
|
|
- commissionId: row.id,
|
|
|
+ commissionId: testId,
|
|
|
isaddType: true,
|
|
|
},
|
|
|
})
|
