Compare commits

...

2 Commits

Author SHA1 Message Date
caiyiling 4b406f96fc Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details
2024-11-13 09:38:05 +08:00
caiyiling 4b31cf1196 稽查更改 2024-11-13 09:37:45 +08:00
1 changed files with 1 additions and 1 deletions

View File

@ -1052,7 +1052,7 @@ export default {
if (v.DataType === 'Array' || v.DataType === 'array') { if (v.DataType === 'Array' || v.DataType === 'array') {
if (obj[v.Code] && obj[v.Code].length > 0) { if (obj[v.Code] && obj[v.Code].length > 0) {
obj[v.Code].forEach((o) => { obj[v.Code].forEach((o) => {
var uo = upObj ? upObj[v.Code].find(u => u[v.ChildDataLabel] == o[v.ChildDataLabel]) : null var uo = upObj && upObj[v.Code] ? upObj[v.Code].find(u => u[v.ChildDataLabel] == o[v.ChildDataLabel]) : null
if (row.OptType === 'Add' || row.OptType === 'Init') { if (row.OptType === 'Add' || row.OptType === 'Init') {
item = { item = {
key: o[v.ChildDataLabel], key: o[v.ChildDataLabel],