|
|
@@ -449,7 +449,9 @@ let configMaterialObj = {
|
|
|
}
|
|
|
if (d[relateField] == 1 && d.id != projectGLJID) continue; //排除其它已被关联的工料机
|
|
|
if (name != '') { //name为''时不做过滤
|
|
|
- if (d.name.indexOf(name) == -1) {
|
|
|
+ const gljName = d.name.replace(/(/g, '(').replace(/)/g, ')');
|
|
|
+ name = name.replace(/(/g, '(').replace(/)/g, ')');
|
|
|
+ if (gljName.indexOf(name) == -1) {
|
|
|
if (!(d[relateField] == 1 && d.id == projectGLJID)) continue; //虽然不匹配,但是是关联的暂估材料,这时应该显示
|
|
|
}
|
|
|
}
|