diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js index 29b2e64..8fa3002 100644 --- a/src/utils/formBuilder.js +++ b/src/utils/formBuilder.js @@ -1270,7 +1270,7 @@ export default function formBuilder( }); } - // 方法2: 如果没找到,从 this.logs 中查找(放宽条件,不要求 target[info.name] 有值) + // 方法2: 如果没找到,从 this.logs 中查找(必须匹配字段ID和类型) if (!log && this.logs && this.logs.length > 0) { log = this.logs.find( (log) => @@ -1286,17 +1286,7 @@ export default function formBuilder( ); } - // 方法3: 如果还是没找到,尝试从 this.logs 中查找所有 status>0 且有签名的 log - if (!log && this.logs && this.logs.length > 0) { - log = this.logs.find( - (log) => - log.status > 0 && - log.user && - log.user.sign_file && - log.user.sign_file.url - ); - } - + // 只有当找到匹配当前字段的log时才显示 if (log && log.status > 0 && log.user && log.user.sign_file && log.user.sign_file.url) { return h("div", { style: { @@ -1320,23 +1310,13 @@ export default function formBuilder( src: log.user.sign_file.url, }, }), - h( - "div", - { - style: { - "margin-top": "4px", - "font-size": "12px", - color: "#909399", - } - }, - log.user?.name || "" - ), h( "div", { style: { "font-size": "12px", color: "#909399", + "margin-top": "4px", } }, log.updated_at @@ -2265,7 +2245,7 @@ export default function formBuilder( }); } - // 方法2: 如果没找到,从 this.logs 中查找(放宽条件,不要求 target[info.name] 有值) + // 方法2: 如果没找到,从 this.logs 中查找(必须匹配字段ID和类型) if (!log && this.logs && this.logs.length > 0) { log = this.logs.find( (log) => @@ -2281,17 +2261,7 @@ export default function formBuilder( ); } - // 方法3: 如果还是没找到,尝试从 this.logs 中查找所有 status>0 且有签名的 log - if (!log && this.logs && this.logs.length > 0) { - log = this.logs.find( - (log) => - log.status > 0 && - log.user && - log.user.sign_file && - log.user.sign_file.url - ); - } - + // 只有当找到匹配当前字段的log时才显示 if (log && log.status > 0 && log.user && log.user.sign_file && log.user.sign_file.url) { return h("div", { style: { @@ -2315,23 +2285,13 @@ export default function formBuilder( src: log.user.sign_file.url, }, }), - h( - "div", - { - style: { - "margin-top": "4px", - "font-size": "12px", - color: "#909399", - } - }, - log.user?.name || "" - ), h( "div", { style: { "font-size": "12px", color: "#909399", + "margin-top": "4px", } }, log.updated_at