|
@@ -115,6 +115,12 @@ export default {
|
|
|
</div>
|
|
|
}
|
|
|
},
|
|
|
+ {
|
|
|
+ columnAttributes: {
|
|
|
+ label: '机型',
|
|
|
+ prop: 'goodsName'
|
|
|
+ },
|
|
|
+ },
|
|
|
...(() => {
|
|
|
if (this.formData.orderType == 'INSTALL') {
|
|
|
return [
|
|
@@ -564,7 +570,7 @@ export default {
|
|
|
return list.filter(item => (
|
|
|
item.type == row.type &&
|
|
|
item.parentCategoryId == row.parentCategoryId &&
|
|
|
- item.categoryId == row.categoryId
|
|
|
+ item.categoryId == row.categoryId
|
|
|
// &&
|
|
|
// !~this.formData.normList.map(v => `${v.type}_${v.parentCategoryId}_${v.categoryId}_${v.label}`).filter(v => (
|
|
|
// v != `${row.type}_${row.parentCategoryId}_${row.categoryId}_${row.label}`
|