From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/webapp/order_mng.xhtml | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/order_mng.xhtml b/src/main/webapp/order_mng.xhtml
index 49edf0a..9fa7b97 100644
--- a/src/main/webapp/order_mng.xhtml
+++ b/src/main/webapp/order_mng.xhtml
@@ -52,10 +52,7 @@
process="@form"
actionListener="#{orderMngController.onViewBtnClick}"
update=":dialog,:dialogForm"></p:commandButton>
- <p:commandButton value="变更条形码" styleClass="edit-btn"
- process="@form"
- actionListener="#{orderMngController.onChangeCodeBtnClick}"
- update=":centerRootPanel" style="width: 148px; "></p:commandButton>
+
<p:commandButton value="删除" styleClass="del-btn"
process="@form"
actionListener="#{orderMngController.onDeleteBtnClick}"
@@ -80,7 +77,7 @@
</p:column>
<p:column headerText="供应商">
- <h:outputText value="#{row.supplyName}"></h:outputText>
+ <h:outputText value="#{row.supplierName}"></h:outputText>
</p:column>
<p:column headerText="下单时间">
@@ -160,15 +157,15 @@
</p:column>
<p:column headerText="管制品">
- <h:outputText value="#{row.reagent!=null?baseMetaService.getBaseMetaValue(row.reagent.controlProducts):''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?row.reagent.controlProducts:''}"></h:outputText>
</p:column>
<p:column headerText="规格型号">
- <h:outputText value="#{row.reagent!=null?baseMetaService.getBaseMetaValue(row.reagent.reagentFormat):''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?row.reagent.reagentFormat:''}"></h:outputText>
</p:column>
<p:column headerText="包装">
- <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)):''}"></h:outputText>
</p:column>
<p:column headerText="含税售价">
@@ -180,15 +177,15 @@
</p:column>
<p:column headerText="危险性质">
- <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentCharacter)}"></h:outputText>
+ <h:outputText value="#{row.reagent.reagentCharacter}"></h:outputText>
</p:column>
<p:column headerText="厂家">
- <h:outputText value="#{row.reagent!=null?row.reagent.productHomeName:''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?row.reagent.productHome:''}"></h:outputText>
</p:column>
<p:column headerText="试剂类型">
- <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentType)}"></h:outputText>
+ <h:outputText value="#{row.reagent.reagentType}"></h:outputText>
</p:column>
<p:column headerText="申购人">
--
Gitblit v1.9.2