|
@@ -30,7 +30,7 @@
|
|
<div class="w-28 ml-2" v-if="tabTypeKey === '2'">
|
|
<div class="w-28 ml-2" v-if="tabTypeKey === '2'">
|
|
<el-select v-model="listItemBaseData.detection_result" placeholder="是否合格" block>
|
|
<el-select v-model="listItemBaseData.detection_result" placeholder="是否合格" block>
|
|
<el-option label="合格" value="1" />
|
|
<el-option label="合格" value="1" />
|
|
- <el-option label="不合格" value="2" />
|
|
|
|
|
|
+ <el-option label="不合格" value="0" />
|
|
</el-select>
|
|
</el-select>
|
|
</div>
|
|
</div>
|
|
<div class="w-36 ml-2">
|
|
<div class="w-36 ml-2">
|
|
@@ -182,12 +182,15 @@ const isMixRatioTestIds = ref(false);
|
|
|
|
|
|
//渲染完成
|
|
//渲染完成
|
|
onMounted(() => {
|
|
onMounted(() => {
|
|
- const { title, mixRatioTestIds } = getObjValue(testTreeItem.value);
|
|
|
|
|
|
+ const { title, mixRatioTestIds} = getObjValue(testTreeItem.value);
|
|
|
|
+ const info = getStoreData('test-form') || {}
|
|
isMixRatioTestIds.value = !(!mixRatioTestIds || mixRatioTestIds <= 0);
|
|
isMixRatioTestIds.value = !(!mixRatioTestIds || mixRatioTestIds <= 0);
|
|
listItemBaseData.value.contractId = contractId.value
|
|
listItemBaseData.value.contractId = contractId.value
|
|
listItemBaseData.value.trialProjectName = title
|
|
listItemBaseData.value.trialProjectName = title
|
|
listItemBaseData.value.reportDate = dayDate
|
|
listItemBaseData.value.reportDate = dayDate
|
|
listItemBaseData.value.detectionCategory = Number(dataType)
|
|
listItemBaseData.value.detectionCategory = Number(dataType)
|
|
|
|
+ listItemBaseData.value.trialUserName =info.trialUserName||''
|
|
|
|
+ listItemBaseData.value.detection_result =info.detectionResult.toString()
|
|
getSearchNodeTables()
|
|
getSearchNodeTables()
|
|
getCategoryData()
|
|
getCategoryData()
|
|
})
|
|
})
|