|
|
|
@ -157,17 +157,17 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="processCode" label="工序"> |
|
|
|
<el-table-column prop="ppsId" label="工序"> |
|
|
|
<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="`tableData1[${scope.$index}].processCode`" |
|
|
|
:prop="`tableData1[${scope.$index}].ppsId`" |
|
|
|
:rules="formRules1.processCode" |
|
|
|
:rules="formRules1.ppsId" |
|
|
|
> |
|
|
|
> |
|
|
|
<el-select |
|
|
|
<el-select |
|
|
|
v-model="scope.row.processCode" |
|
|
|
v-model="scope.row.ppsId" |
|
|
|
placeholder="请选择" |
|
|
|
placeholder="请选择" |
|
|
|
clearable |
|
|
|
clearable |
|
|
|
filterable |
|
|
|
filterable |
|
|
|
@ -183,17 +183,17 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
</template> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="craftCode" label="工艺能力"> |
|
|
|
<el-table-column prop="caId" label="工艺能力"> |
|
|
|
<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="`tableData1[${scope.$index}].craftCode`" |
|
|
|
:prop="`tableData1[${scope.$index}].caId`" |
|
|
|
:rules="formRules1.craftCode" |
|
|
|
:rules="formRules1.caId" |
|
|
|
> |
|
|
|
> |
|
|
|
<el-select |
|
|
|
<el-select |
|
|
|
v-model="scope.row.craftCode" |
|
|
|
v-model="scope.row.caId" |
|
|
|
placeholder="请选择" |
|
|
|
placeholder="请选择" |
|
|
|
clearable |
|
|
|
clearable |
|
|
|
filterable |
|
|
|
filterable |
|
|
|
@ -617,9 +617,9 @@ export default { |
|
|
|
selectIds: [], //选中ID |
|
|
|
selectIds: [], //选中ID |
|
|
|
}, |
|
|
|
}, |
|
|
|
formRules1: { |
|
|
|
formRules1: { |
|
|
|
processCode: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
ppsId: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
processName: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
processName: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
craftCode: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
caId: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
proDes: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
proDes: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
proHours: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }], |
|
|
|
proHours: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }], |
|
|
|
isMain: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
isMain: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], |
|
|
|
@ -700,10 +700,10 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 获取工序名字 |
|
|
|
// 获取工序名字 |
|
|
|
processChange(row, index) { |
|
|
|
processChange(row, index) { |
|
|
|
let selectName = this.processSetOption.find(item => item.id == row.processCode); |
|
|
|
let selectName = this.processSetOption.find(item => item.id == row.ppsId); |
|
|
|
this.form1.tableData1[index].processName = selectName.name; |
|
|
|
this.form1.tableData1[index].processName = selectName.name; |
|
|
|
|
|
|
|
this.form1.tableData1[index].processCode = selectName.code; |
|
|
|
if (this.form1.tableData1[index].processName.indexOf('涂色标') > -1) { |
|
|
|
if (this.form1.tableData1[index].processName.indexOf('涂色标') > -1) { |
|
|
|
console.log(this.partInfoData, this.dictionaryData, 'this.partInfoData'); |
|
|
|
|
|
|
|
// tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数 |
|
|
|
// tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数 |
|
|
|
let sum_ = 0; |
|
|
|
let sum_ = 0; |
|
|
|
if (this.partInfoData.tsbNum) { |
|
|
|
if (this.partInfoData.tsbNum) { |
|
|
|
@ -724,8 +724,9 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 获取工艺能力名字 |
|
|
|
// 获取工艺能力名字 |
|
|
|
craftChange(row, index) { |
|
|
|
craftChange(row, index) { |
|
|
|
let selectName = this.craftAbilityOption.find(item => item.id == row.craftCode); |
|
|
|
let selectName = this.craftAbilityOption.find(item => item.id == row.caId); |
|
|
|
this.form1.tableData1[index].craftName = selectName.name; |
|
|
|
this.form1.tableData1[index].craftName = selectName.name; |
|
|
|
|
|
|
|
this.form1.tableData1[index].craftCode = selectName.code; |
|
|
|
}, |
|
|
|
}, |
|
|
|
// 获取生产标识列表 |
|
|
|
// 获取生产标识列表 |
|
|
|
getPqList() { |
|
|
|
getPqList() { |
|
|
|
@ -784,9 +785,9 @@ export default { |
|
|
|
return { |
|
|
|
return { |
|
|
|
id: null, // 新增时通常设为 null |
|
|
|
id: null, // 新增时通常设为 null |
|
|
|
processNo: this.getProcessNo(this.form1.tableData1), // 自动生成工序号 |
|
|
|
processNo: this.getProcessNo(this.form1.tableData1), // 自动生成工序号 |
|
|
|
processCode: item.processCode || item.id, // 假设模板中有 processCode 或 id |
|
|
|
ppsId: item.ppsId || item.id, // 假设模板中有 ppsId 或 id |
|
|
|
processName: item.processName, |
|
|
|
processName: item.processName, |
|
|
|
craftCode: item.craftCode, |
|
|
|
caId: item.caId, |
|
|
|
craftName: item.craftName, |
|
|
|
craftName: item.craftName, |
|
|
|
proDes: item.proDes || item.description, |
|
|
|
proDes: item.proDes || item.description, |
|
|
|
proHours: item.proHours || '', |
|
|
|
proHours: item.proHours || '', |
|
|
|
|