|
|
|
|
@ -196,6 +196,7 @@ |
|
|
|
|
placeholder="请选择" |
|
|
|
|
clearable |
|
|
|
|
filterable |
|
|
|
|
@change="changeMakeTeam(scope.row, scope.$index)" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="(item, index) in teamOptions" |
|
|
|
|
@ -403,7 +404,6 @@ |
|
|
|
|
placeholder="请输入" |
|
|
|
|
style="width: 100%" |
|
|
|
|
></el-input> |
|
|
|
|
|
|
|
|
|
</el-form-item> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
@ -681,7 +681,8 @@ export default { |
|
|
|
|
projectChange(row, index) { |
|
|
|
|
let selectName = this.projectOptions.find(item => item.id == row.projectCode); |
|
|
|
|
this.form2.tableData2[index].projectName = selectName.name; |
|
|
|
|
this.form2.tableData2[index].proHours = selectName.standardWorkMinute != -1 ? selectName.standardWorkMinute : 0; |
|
|
|
|
this.form2.tableData2[index].proHours = |
|
|
|
|
selectName.standardWorkMinute != -1 ? selectName.standardWorkMinute : 0; |
|
|
|
|
}, |
|
|
|
|
// 获取检验标准名字 |
|
|
|
|
standardChange(row, index) { |
|
|
|
|
@ -693,11 +694,17 @@ export default { |
|
|
|
|
this.standardList = res.data.data; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
getTeamSetList() { |
|
|
|
|
getTeamSetList().then(res => { |
|
|
|
|
this.teamOptions = res.data.data; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
// 获取班组名字 |
|
|
|
|
changeMakeTeam(row, index) { |
|
|
|
|
let selectName = this.teamOptions.find(item => item.id == row.makeTeam); |
|
|
|
|
this.form1.tableData1[index].makeTeamName = selectName.name; |
|
|
|
|
}, |
|
|
|
|
getProject() { |
|
|
|
|
getProject({ size: 999999, current: 1 }).then(res => { |
|
|
|
|
this.projectOptions = res.data.data.records; |
|
|
|
|
@ -802,8 +809,7 @@ export default { |
|
|
|
|
this.form1.tableData1 = [...existing, ...mappedData]; // 追加模式 |
|
|
|
|
|
|
|
|
|
// 先保存工序信息 |
|
|
|
|
this.saveProcessInfo().then(() => { |
|
|
|
|
}); |
|
|
|
|
this.saveProcessInfo().then(() => {}); |
|
|
|
|
|
|
|
|
|
this.$message.success('模板导入成功'); |
|
|
|
|
}); |
|
|
|
|
@ -840,7 +846,10 @@ export default { |
|
|
|
|
label: `${craftInfo?.reworkOrder || '返工单'}`, |
|
|
|
|
children: processList.map(process => { |
|
|
|
|
const ppsName = |
|
|
|
|
process.processInfo.ppsName || process.processInfo.name || process.processInfo.processName || '未知工序'; |
|
|
|
|
process.processInfo.ppsName || |
|
|
|
|
process.processInfo.name || |
|
|
|
|
process.processInfo.processName || |
|
|
|
|
'未知工序'; |
|
|
|
|
|
|
|
|
|
// 将 projectList 转为第四级子节点 |
|
|
|
|
const projectChildren = (process.projectList || []).map(project => ({ |
|
|
|
|
|