|
|
|
@ -136,12 +136,12 @@ |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
<template #default="scope"> |
|
|
|
<template #default="scope"> |
|
|
|
<el-form-item |
|
|
|
<el-form-item |
|
|
|
:prop="`tableData[${scope.$index}].processCode`" |
|
|
|
:prop="`tableData[${scope.$index}].processId`" |
|
|
|
:rules="rules.tableData.processCode" |
|
|
|
:rules="rules.tableData.processId" |
|
|
|
label-width="0" |
|
|
|
label-width="0" |
|
|
|
> |
|
|
|
> |
|
|
|
<el-select |
|
|
|
<el-select |
|
|
|
v-model="scope.row.processCode" |
|
|
|
v-model="scope.row.processId" |
|
|
|
placeholder="请选择" |
|
|
|
placeholder="请选择" |
|
|
|
@change="processChange(scope.row, scope.$index)" |
|
|
|
@change="processChange(scope.row, scope.$index)" |
|
|
|
clearable |
|
|
|
clearable |
|
|
|
@ -157,23 +157,24 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="craftCode" label="工艺能力" align="left"> |
|
|
|
<el-table-column prop="caId" label="工艺能力" align="left"> |
|
|
|
<template #header> |
|
|
|
<template #header> |
|
|
|
<span><i style="color: red">*</i>工艺能力</span> |
|
|
|
<span><i style="color: red">*</i>工艺能力</span> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
<template #default="scope"> |
|
|
|
<template #default="scope"> |
|
|
|
<el-form-item |
|
|
|
<el-form-item |
|
|
|
:prop="`tableData[${scope.$index}].craftCode`" |
|
|
|
:prop="`tableData[${scope.$index}].caId`" |
|
|
|
:rules="rules.tableData.craftCode" |
|
|
|
:rules="rules.tableData.caId" |
|
|
|
label-width="0" |
|
|
|
label-width="0" |
|
|
|
> |
|
|
|
> |
|
|
|
<el-select |
|
|
|
<el-select |
|
|
|
v-model="scope.row.craftCode" |
|
|
|
v-model="scope.row.caId" |
|
|
|
placeholder="请选择" |
|
|
|
placeholder="请选择" |
|
|
|
clearable |
|
|
|
clearable |
|
|
|
filterable |
|
|
|
filterable |
|
|
|
|
|
|
|
@change="craftChange(scope.row, scope.$index)" |
|
|
|
> |
|
|
|
> |
|
|
|
<el-option v-for="item in craftCodeList" :label="item.name" :value="item.id"> |
|
|
|
<el-option v-for="item in caIdList" :label="item.name" :value="item.id"> |
|
|
|
</el-option> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
@ -413,7 +414,7 @@ export default { |
|
|
|
activeName: '1', |
|
|
|
activeName: '1', |
|
|
|
treeLeave: 1, //组织树选中层级 |
|
|
|
treeLeave: 1, //组织树选中层级 |
|
|
|
formLoading: false, |
|
|
|
formLoading: false, |
|
|
|
craftCodeList: [], //工艺能力列表 |
|
|
|
caIdList: [], //工艺能力列表 |
|
|
|
formError: '', // 全局错误提示 |
|
|
|
formError: '', // 全局错误提示 |
|
|
|
processTemplateList: [], |
|
|
|
processTemplateList: [], |
|
|
|
platingTypeList: [], |
|
|
|
platingTypeList: [], |
|
|
|
@ -487,7 +488,7 @@ export default { |
|
|
|
], |
|
|
|
], |
|
|
|
processNo: [{ required: true, message: '请输入工序号', trigger: 'blur' }], |
|
|
|
processNo: [{ required: true, message: '请输入工序号', trigger: 'blur' }], |
|
|
|
processCode: [{ required: true, message: '请选择工序代码', trigger: 'blur' }], |
|
|
|
processCode: [{ required: true, message: '请选择工序代码', trigger: 'blur' }], |
|
|
|
craftCode: [{ required: true, message: '请选择工艺能力', trigger: 'blur' }], |
|
|
|
caId: [{ required: true, message: '请选择工艺能力', trigger: 'blur' }], |
|
|
|
workHours: [{ required: true, message: '请输入工时(分钟)', trigger: 'blur' }], |
|
|
|
workHours: [{ required: true, message: '请输入工时(分钟)', trigger: 'blur' }], |
|
|
|
proDes: [{ required: true, message: '请输入工序描述', trigger: 'blur' }], |
|
|
|
proDes: [{ required: true, message: '请输入工序描述', trigger: 'blur' }], |
|
|
|
isMain: [{ required: true, message: '请选择主工序', trigger: 'blur' }], |
|
|
|
isMain: [{ required: true, message: '请选择主工序', trigger: 'blur' }], |
|
|
|
@ -536,12 +537,24 @@ export default { |
|
|
|
// 获取检验项目名字 |
|
|
|
// 获取检验项目名字 |
|
|
|
projectChange(row, index) { |
|
|
|
projectChange(row, index) { |
|
|
|
let selectName = this.projectOptions.find(item => item.id == row.projectCode); |
|
|
|
let selectName = this.projectOptions.find(item => item.id == row.projectCode); |
|
|
|
this.form2.tableData2[index].projectName = selectName.name; |
|
|
|
row.projectName = selectName.name; |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 获取检验标准名字 |
|
|
|
// 获取检验标准名字 |
|
|
|
standardChange(row, index) { |
|
|
|
standardChange(row, index) { |
|
|
|
let selectName = this.standardList.find(item => item.id == row.projectStandard); |
|
|
|
let selectName = this.standardList.find(item => item.id == row.projectStandard); |
|
|
|
this.form2.tableData2[index].projectStandardName = selectName.name; |
|
|
|
row.projectStandardName = selectName.name; |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
// 工序代码选择 |
|
|
|
|
|
|
|
processChange(row, index) { |
|
|
|
|
|
|
|
let selected = this.processList.find(item => item.id == row.ppsId); |
|
|
|
|
|
|
|
row.processName = selected.name; |
|
|
|
|
|
|
|
row.processCode = selected.code; |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
// 获取工艺能力名字 |
|
|
|
|
|
|
|
craftChange(row, index) { |
|
|
|
|
|
|
|
let selectName = this.caIdList.find(item => item.id == row.caId); |
|
|
|
|
|
|
|
row.craftName = selectName.name; |
|
|
|
|
|
|
|
row.craftCode = selectName.code; |
|
|
|
}, |
|
|
|
}, |
|
|
|
getStandardList() { |
|
|
|
getStandardList() { |
|
|
|
getStandardList().then(res => { |
|
|
|
getStandardList().then(res => { |
|
|
|
@ -598,9 +611,10 @@ export default { |
|
|
|
getProcessAbilityList() { |
|
|
|
getProcessAbilityList() { |
|
|
|
getProcessAbilityList().then(res => { |
|
|
|
getProcessAbilityList().then(res => { |
|
|
|
console.log('99999', res.data.data); |
|
|
|
console.log('99999', res.data.data); |
|
|
|
this.craftCodeList = res.data.data; |
|
|
|
this.caIdList = res.data.data; |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
getWorkCenterList() { |
|
|
|
getWorkCenterList() { |
|
|
|
getWorkCenterList({ current: 1, size: 99999 }).then(res => { |
|
|
|
getWorkCenterList({ current: 1, size: 99999 }).then(res => { |
|
|
|
this.workCenterList = res.data.data; |
|
|
|
this.workCenterList = res.data.data; |
|
|
|
@ -657,12 +671,6 @@ export default { |
|
|
|
this.ruleForm.tableData.splice(index, 1); |
|
|
|
this.ruleForm.tableData.splice(index, 1); |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 工序代码选择 |
|
|
|
|
|
|
|
processChange(row, index) { |
|
|
|
|
|
|
|
let selected = this.processList.find(item => item.id == row.processCode); |
|
|
|
|
|
|
|
row.processName = selected.name; |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
submit() { |
|
|
|
submit() { |
|
|
|
this.$refs.ruleForm.validate(valid => { |
|
|
|
this.$refs.ruleForm.validate(valid => { |
|
|
|
if (valid) { |
|
|
|
if (valid) { |
|
|
|
|