|
@@ -406,6 +406,8 @@ const getcomdata = async (pcId) => {
|
|
|
|
|
|
if (item.valueType === 1) {
|
|
if (item.valueType === 1) {
|
|
promises.push(getlistopt(item, "value"))
|
|
promises.push(getlistopt(item, "value"))
|
|
|
|
+ }else if( item.valueType === 0 ){
|
|
|
|
+ item.value = item.valueDef
|
|
}
|
|
}
|
|
|
|
|
|
if (item.unitType !== "无") {
|
|
if (item.unitType !== "无") {
|
|
@@ -526,8 +528,8 @@ const getbtnvalue = async (pcaId, dataType) => {
|
|
cdvId: header.cdvId,
|
|
cdvId: header.cdvId,
|
|
property: header?.name || "",
|
|
property: header?.name || "",
|
|
value: dataItem?.value || "",
|
|
value: dataItem?.value || "",
|
|
- pcadgId: dataItem?.pcadgId || "",
|
|
|
|
- pcadId: rowCount,
|
|
|
|
|
|
+ pcadId: dataItem?.pcadId || "",
|
|
|
|
+ pcadgId: rowCount,
|
|
unit: dataItem?.unit || "无"
|
|
unit: dataItem?.unit || "无"
|
|
})
|
|
})
|
|
})
|
|
})
|