Browse Source

Merge pull request #17215 in DESIGN/design from bugfix/11.0 to feature/x

* commit '71a9b59abcc9421af523d7300cbd88574bc0d73e':
  REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
feature/x
superman 3 weeks ago
parent
commit
d23b1a0dc9
  1. 4
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java

4
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java

@ -59,6 +59,7 @@ public class TemplateResourceDetailPane extends JPanel {
private static final String PARENT_PACKAGE = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Parent_Package"); private static final String PARENT_PACKAGE = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Parent_Package");
private static final String DETAIL_INFO = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Info"); private static final String DETAIL_INFO = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Info");
private static final String FREE = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Price_Free"); private static final String FREE = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Price_Free");
private static final String SALES_CONSULTATION = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Detail_Sales_Consultation");
private static final String SPACE = " "; private static final String SPACE = " ";
private static final String LF = "<br>"; private static final String LF = "<br>";
private static final String RMB = "¥"; private static final String RMB = "¥";
@ -75,7 +76,6 @@ public class TemplateResourceDetailPane extends JPanel {
private static final String HTML_P_TAG_FORMAT = "<p style=\"margin-top:5pt;\">%s</p>"; private static final String HTML_P_TAG_FORMAT = "<p style=\"margin-top:5pt;\">%s</p>";
public TemplateResourceDetailPane(TemplateResourceDetail detail) { public TemplateResourceDetailPane(TemplateResourceDetail detail) {
this.data = detail; this.data = detail;
initComponent(); initComponent();
@ -125,6 +125,8 @@ public class TemplateResourceDetailPane extends JPanel {
priceLabel.setForeground(Color.RED); priceLabel.setForeground(Color.RED);
if (data.getPrice() == 0) { if (data.getPrice() == 0) {
priceLabel.setText(FREE); priceLabel.setText(FREE);
} else if (data.getPrice() == -1) {
priceLabel.setText(SALES_CONSULTATION);
} else { } else {
priceLabel.setText(RMB + SPACE + data.getPrice()); priceLabel.setText(RMB + SPACE + data.getPrice());
} }

Loading…
Cancel
Save