|
|
|
@ -373,7 +373,6 @@ |
|
|
|
class="tableHeight" |
|
|
|
class="tableHeight" |
|
|
|
style="width: 100%" |
|
|
|
style="width: 100%" |
|
|
|
@selection-change="handleSelectionChange3" |
|
|
|
@selection-change="handleSelectionChange3" |
|
|
|
|
|
|
|
|
|
|
|
> |
|
|
|
> |
|
|
|
<el-table-column type="selection" width="55"></el-table-column> |
|
|
|
<el-table-column type="selection" width="55"></el-table-column> |
|
|
|
<el-table-column prop="trialNo" label="工序号"> |
|
|
|
<el-table-column prop="trialNo" label="工序号"> |
|
|
|
@ -794,14 +793,33 @@ export default { |
|
|
|
proHours: item.proHours || '', |
|
|
|
proHours: item.proHours || '', |
|
|
|
setoutHours: item.setoutHours || '', |
|
|
|
setoutHours: item.setoutHours || '', |
|
|
|
isMain: item.isMain || '0', |
|
|
|
isMain: item.isMain || '0', |
|
|
|
|
|
|
|
processProjectList: item.modelProjectList || [], |
|
|
|
// 其他字段按需补充... |
|
|
|
// 其他字段按需补充... |
|
|
|
}; |
|
|
|
}; |
|
|
|
}); |
|
|
|
}); |
|
|
|
// 赋值(方式1)或追加(方式2) |
|
|
|
// 赋值(方式1)或追加(方式2) |
|
|
|
this.form1.tableData1 = [...existing, ...mappedData]; // 追加模式 |
|
|
|
this.form1.tableData1 = [...existing, ...mappedData]; // 追加模式 |
|
|
|
|
|
|
|
|
|
|
|
this.modelLevelLoading = false; |
|
|
|
this.modelLevelLoading = false; |
|
|
|
|
|
|
|
let query_ = { |
|
|
|
|
|
|
|
dsPart: this.partInfoData, //零件信息 |
|
|
|
|
|
|
|
craft: this.treeNodes.rawData, //工艺信息 |
|
|
|
|
|
|
|
processList: this.form1.tableData1, //工序集合 |
|
|
|
|
|
|
|
deleteIds: this.form1.deleteIds, //删除ids |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
authorizedAccomplish2(query_) |
|
|
|
|
|
|
|
.then(res => { |
|
|
|
|
|
|
|
this.$message.success('保存成功'); |
|
|
|
|
|
|
|
this.craftLoading = false; |
|
|
|
|
|
|
|
this.getDetails(); |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
.catch(err => { |
|
|
|
|
|
|
|
this.craftLoading = false; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
this.$message.success('模板导入成功'); |
|
|
|
// this.$message.success('模板导入成功'); |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 获取零件信息详情数据 |
|
|
|
// 获取零件信息详情数据 |
|
|
|
@ -1438,6 +1456,9 @@ export default { |
|
|
|
padding: 12px; |
|
|
|
padding: 12px; |
|
|
|
background: #e4e7ed; |
|
|
|
background: #e4e7ed; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// .el-tree{ |
|
|
|
|
|
|
|
// height: calc(100vh - 200px - 50px - 50px - 50px); |
|
|
|
|
|
|
|
// } |
|
|
|
} |
|
|
|
} |
|
|
|
:deep(.el-form-item) { |
|
|
|
:deep(.el-form-item) { |
|
|
|
margin-bottom: 0px !important; |
|
|
|
margin-bottom: 0px !important; |
|
|
|
|