|
|
|
|
@ -922,10 +922,11 @@ export default { |
|
|
|
|
(row) => { |
|
|
|
|
const deptId = row.department; |
|
|
|
|
const dept = this.list.find((item) => item.departmentId === deptId); |
|
|
|
|
const oneFormId = row.id; |
|
|
|
|
|
|
|
|
|
let select = this.materials.find( |
|
|
|
|
(item) => item.materialId === row.materialId |
|
|
|
|
); |
|
|
|
|
const oneFormId = (this.sizeForm.options === 1&&this.outDialogTiltle == "编辑")? row.oneFormId:select.id; |
|
|
|
|
|
|
|
|
|
return { |
|
|
|
|
...row, |
|
|
|
|
@ -933,7 +934,7 @@ export default { |
|
|
|
|
this.sizeForm.options == "1" ? arr.departmentId : deptId, |
|
|
|
|
departmentName: |
|
|
|
|
this.sizeForm.options == "1" ? arr.department : dept.department, |
|
|
|
|
oneFormId: row.oneFormId, |
|
|
|
|
oneFormId: oneFormId, |
|
|
|
|
}; |
|
|
|
|
} |
|
|
|
|
); |
|
|
|
|
|