|
@@ -165,7 +165,7 @@
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="" prop="measurementUnit">
|
|
<el-table-column label="" prop="measurementUnit">
|
|
|
<template slot-scope="{ row, $index }">
|
|
<template slot-scope="{ row, $index }">
|
|
|
- {{ row.weightUnit }} /{{ row.packingUnit }}
|
|
|
|
|
|
|
+ {{ handleRowUnit(row) }} /{{ row.packingUnit }}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -389,6 +389,14 @@
|
|
|
getMaterialType: useDictLabel(materialType),
|
|
getMaterialType: useDictLabel(materialType),
|
|
|
getInputStatus: useDictLabel(inputStatus),
|
|
getInputStatus: useDictLabel(inputStatus),
|
|
|
getSceneState: useDictLabel(sceneState),
|
|
getSceneState: useDictLabel(sceneState),
|
|
|
|
|
+ handleRowUnit(row) {
|
|
|
|
|
+ if (this.extInfo.assetType == 1) {
|
|
|
|
|
+ console.log(row);
|
|
|
|
|
+ return row.weightUnit;
|
|
|
|
|
+ } else if (this.extInfo.assetType == 4) {
|
|
|
|
|
+ return row.measuringUnit;
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
handleAssetType(r) {
|
|
handleAssetType(r) {
|
|
|
const code = this.codeList.find((item) => item.dictCode == r);
|
|
const code = this.codeList.find((item) => item.dictCode == r);
|
|
|
return code?.dictValue;
|
|
return code?.dictValue;
|