Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
zhangzhiguo 2024-12-15 20:44:32 +08:00
commit 61874f6be2
1 changed files with 0 additions and 7 deletions

View File

@ -20,17 +20,12 @@ public class ResourceFilterExtPlugin extends ResourceItemListPlugin {
if (contractType != null) { if (contractType != null) {
if (contractType.toString().equals("wzcg")) {//物资采购 if (contractType.toString().equals("wzcg")) {//物资采购
this.setResourceTypeStyle("material");
this.afterSelectedTag("material");
} else if (contractType.toString().equals("sbcg")) {//设备采购 } else if (contractType.toString().equals("sbcg")) {//设备采购
this.setResourceTypeStyle("equipment"); this.setResourceTypeStyle("equipment");
this.afterSelectedTag("equipment"); this.afterSelectedTag("equipment");
}else if (contractType.toString().equals("qtcc") || contractType.toString().equals("lwlcc")) {//产出物 }else if (contractType.toString().equals("qtcc") || contractType.toString().equals("lwlcc")) {//产出物
this.setResourceTypeStyle("turnover"); this.setResourceTypeStyle("turnover");
this.afterSelectedTag("turnover"); this.afterSelectedTag("turnover");
}else{
this.setResourceTypeStyle("material");
this.afterSelectedTag("material");
} }
} }
}else{ }else{
@ -59,8 +54,6 @@ public class ResourceFilterExtPlugin extends ResourceItemListPlugin {
}else if (contractType.toString().equals("qtcc") || contractType.toString().equals("lwlcc")) {//产出物 }else if (contractType.toString().equals("qtcc") || contractType.toString().equals("lwlcc")) {//产出物
this.getView().setVisible(true, new String[]{"flexpanelturnover"}); this.getView().setVisible(true, new String[]{"flexpanelturnover"});
this.getView().setVisible(false, new String[]{"flexpanelsub", "flexpanellabour", "flexpanelcomposite", "flexpanelequipment", "flexpanelmaterial","flexpanelother"}); this.getView().setVisible(false, new String[]{"flexpanelsub", "flexpanellabour", "flexpanelcomposite", "flexpanelequipment", "flexpanelmaterial","flexpanelother"});
}else{
this.getView().setVisible(true, new String[]{"flexpanelturnover","flexpanelsub", "flexpanellabour", "flexpanelcomposite", "flexpanelequipment", "flexpanelmaterial","flexpanelother"});
} }
} }
} }