|
|
|
|
@ -26,6 +26,23 @@ |
|
|
|
|
<template #menu-right> |
|
|
|
|
<el-button type="primary" @click="handleImport">导入 </el-button> |
|
|
|
|
</template> |
|
|
|
|
<template #levelNum-form="{ type }"> |
|
|
|
|
<div style="width: 100%;"> |
|
|
|
|
{{ console.log('levelNum-form 插槽渲染, type:', type, 'form.levelNum:', form.levelNum, 'form.levelNum类型:', typeof form.levelNum, '是否数组:', Array.isArray(form.levelNum), 'gradeData前3项:', gradeData.slice(0, 3)) }} |
|
|
|
|
<el-transfer |
|
|
|
|
v-if="type === 'add' || type === 'edit'" |
|
|
|
|
v-model="form.levelNum" |
|
|
|
|
:data="gradeData" |
|
|
|
|
:titles="['未选择', '已选择']" |
|
|
|
|
filterable |
|
|
|
|
:props="{ |
|
|
|
|
key: 'key', |
|
|
|
|
label: 'label' |
|
|
|
|
}" |
|
|
|
|
style="text-align: left;" |
|
|
|
|
></el-transfer> |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
</avue-crud> |
|
|
|
|
<barchSet v-if="isOpen" :showDialog="isOpen" :list="selectionList" @closeDialog="closeDialog"></barchSet> |
|
|
|
|
<!-- 导入 --> |
|
|
|
|
@ -40,6 +57,7 @@ |
|
|
|
|
import barchSet from "./barchSet.vue"; |
|
|
|
|
import basicImport from '@/components/basic-import/main.vue' |
|
|
|
|
import {getList,addThickness,updateThickness,deleteThickness} from "@/api/basicData/platThicknessRelation" |
|
|
|
|
import {getProduction} from "@/api/basicData/ruleMaintenance" |
|
|
|
|
export default { |
|
|
|
|
components: { |
|
|
|
|
barchSet, |
|
|
|
|
@ -51,6 +69,7 @@ export default { |
|
|
|
|
selectionList: [], |
|
|
|
|
loading:false, |
|
|
|
|
query:{}, |
|
|
|
|
gradeData: [], |
|
|
|
|
option: { |
|
|
|
|
height: "auto", |
|
|
|
|
calcHeight: 32, |
|
|
|
|
@ -105,37 +124,17 @@ export default { |
|
|
|
|
prop: "thicknessCode", |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
span: 12, |
|
|
|
|
labelWidth: 150, |
|
|
|
|
span: 24, |
|
|
|
|
search: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "质量等级", |
|
|
|
|
prop: "levelNum", |
|
|
|
|
type:"select", |
|
|
|
|
// multiple: true, |
|
|
|
|
// multipleLimit: 0, |
|
|
|
|
dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", |
|
|
|
|
props:{ |
|
|
|
|
label:"qualityGrade", |
|
|
|
|
value:"qualityGrade" |
|
|
|
|
}, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
span: 12, |
|
|
|
|
search: false, |
|
|
|
|
formatter: (row, value, label, column) => { |
|
|
|
|
if (Array.isArray(value)) { |
|
|
|
|
return value.join(', '); |
|
|
|
|
} |
|
|
|
|
return value || ''; |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
label: "是否以21E8-210开头", |
|
|
|
|
prop: "startF21e8", |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
span: 12, |
|
|
|
|
span: 24, |
|
|
|
|
search: false, |
|
|
|
|
labelWidth: 150, |
|
|
|
|
type: "select", |
|
|
|
|
@ -153,10 +152,29 @@ export default { |
|
|
|
|
{ |
|
|
|
|
label: "厚度", |
|
|
|
|
prop: "thickness", |
|
|
|
|
labelWidth: 150, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
span: 24, |
|
|
|
|
search: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "质量等级", |
|
|
|
|
prop: "levelNum", |
|
|
|
|
labelWidth: 150, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
span: 12, |
|
|
|
|
span: 24, |
|
|
|
|
search: false, |
|
|
|
|
addDisplay: true, |
|
|
|
|
editDisplay: true, |
|
|
|
|
formslot: true, |
|
|
|
|
formatter: (row, value, label, column) => { |
|
|
|
|
if (Array.isArray(value)) { |
|
|
|
|
return value.join(', '); |
|
|
|
|
} |
|
|
|
|
return value || ''; |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
}, |
|
|
|
|
@ -169,7 +187,58 @@ export default { |
|
|
|
|
isOpen: false, |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
this.loadGradeData() |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
loadGradeData() { |
|
|
|
|
getProduction().then(res => { |
|
|
|
|
const rawData = res.data.data || [] |
|
|
|
|
this.gradeData = rawData.map(item => ({ |
|
|
|
|
key: String(item.qualityGrade), |
|
|
|
|
label: String(item.qualityGrade), |
|
|
|
|
qualityGrade: item.qualityGrade |
|
|
|
|
})) |
|
|
|
|
console.log('质量等级数据加载完成:', this.gradeData) |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
beforeOpen(done, type) { |
|
|
|
|
console.log('beforeOpen 开始, type:', type) |
|
|
|
|
console.log('当前form.levelNum:', this.form.levelNum, '类型:', typeof this.form.levelNum) |
|
|
|
|
|
|
|
|
|
// 确保数据已加载 |
|
|
|
|
if (this.gradeData.length === 0) { |
|
|
|
|
this.loadGradeData() |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 立即进行数据转换 |
|
|
|
|
if (type == 'edit') { |
|
|
|
|
if (this.form.levelNum) { |
|
|
|
|
console.log('编辑模式，原始levelNum:', this.form.levelNum, '类型:', typeof this.form.levelNum) |
|
|
|
|
// 将 levelNum 转换为字符串数组，确保类型一致 |
|
|
|
|
if (typeof this.form.levelNum === 'string') { |
|
|
|
|
this.form.levelNum = this.form.levelNum.split(',').map(item => String(item).trim()).filter(item => item !== '') |
|
|
|
|
} else if (typeof this.form.levelNum === 'number') { |
|
|
|
|
this.form.levelNum = [String(this.form.levelNum)] |
|
|
|
|
} else if (Array.isArray(this.form.levelNum)) { |
|
|
|
|
this.form.levelNum = this.form.levelNum.map(item => String(item).trim()) |
|
|
|
|
} |
|
|
|
|
console.log('编辑模式，处理后levelNum:', this.form.levelNum, '是否数组:', Array.isArray(this.form.levelNum)) |
|
|
|
|
} else { |
|
|
|
|
this.form.levelNum = [] |
|
|
|
|
} |
|
|
|
|
} else if (type == 'add') { |
|
|
|
|
this.form.levelNum = [] |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
console.log('beforeOpen 结束，form.levelNum:', this.form.levelNum, '是否数组:', Array.isArray(this.form.levelNum)) |
|
|
|
|
// 先调用 done() 让对话框显示 |
|
|
|
|
done() |
|
|
|
|
// 然后在 nextTick 中再次确认数据 |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
console.log('nextTick 中的 form.levelNum:', this.form.levelNum, '是否数组:', Array.isArray(this.form.levelNum)) |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
// 点击导入按钮 |
|
|
|
|
handleImport() { |
|
|
|
|
this.isShowImport = true |
|
|
|
|
@ -191,7 +260,11 @@ export default { |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
rowSave(row, done, loading){ |
|
|
|
|
addThickness(row).then(res =>{ |
|
|
|
|
const params = { |
|
|
|
|
...row, |
|
|
|
|
levelNum: Array.isArray(row.levelNum) ? row.levelNum.join(',') : row.levelNum |
|
|
|
|
} |
|
|
|
|
addThickness(params).then(res => { |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
this.$message.success('新增成功') |
|
|
|
|
this.onLoad() |
|
|
|
|
@ -200,7 +273,11 @@ export default { |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
rowUpdate(row, index, done, loading){ |
|
|
|
|
updateThickness(row).then(res =>{ |
|
|
|
|
const params = { |
|
|
|
|
...row, |
|
|
|
|
levelNum: Array.isArray(row.levelNum) ? row.levelNum.join(',') : row.levelNum |
|
|
|
|
} |
|
|
|
|
updateThickness(params).then(res =>{ |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
this.$message.success('修改成功') |
|
|
|
|
this.onLoad() |
|
|
|
|
|
