|
|
@ -320,7 +320,7 @@ |
|
|
width="50"> |
|
|
width="50"> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
prop="itemNo" |
|
|
|
|
|
|
|
|
prop="propertiesItemNo" |
|
|
header-align="center" |
|
|
header-align="center" |
|
|
align="center" |
|
|
align="center" |
|
|
min-width="80" |
|
|
min-width="80" |
|
|
@ -1142,7 +1142,8 @@ export default { |
|
|
functionType: this.detailData.functionType, |
|
|
functionType: this.detailData.functionType, |
|
|
// itemNo: this.itemListRow2.itemNo, |
|
|
// itemNo: this.itemListRow2.itemNo, |
|
|
// itemDesc:this.itemListRow2.itemDesc, |
|
|
// itemDesc:this.itemListRow2.itemDesc, |
|
|
itemList: this.itemSelections2, |
|
|
|
|
|
|
|
|
// 已有属性列表返回的是 propertiesItemNo,删除 SQL 用 itemNo 匹配,这里补上 |
|
|
|
|
|
itemList: this.itemSelections2.map(item => ({ ...item, itemNo: item.itemNo || item.propertiesItemNo })), |
|
|
itemType: this.detailData.itemType, |
|
|
itemType: this.detailData.itemType, |
|
|
userId: this.$store.state.user.name |
|
|
userId: this.$store.state.user.name |
|
|
} |
|
|
} |
|
|
|