From 1123d12eb51d23edcd4a39660ef8cd47802b931d Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 30 一月 2024 11:06:32 +0800
Subject: [PATCH] change config
---
src/main/webapp/reagent_mng.xhtml | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/reagent_mng.xhtml b/src/main/webapp/reagent_mng.xhtml
index e4c1195..c893130 100644
--- a/src/main/webapp/reagent_mng.xhtml
+++ b/src/main/webapp/reagent_mng.xhtml
@@ -39,7 +39,7 @@
</p:panelGrid>
</p:panel>
<p:panel styleClass="center-body">
- <p:panelGrid columns="8" styleClass="btn">
+ <p:panelGrid columns="9" styleClass="btn">
<p:commandButton value="新建" styleClass="new-btn"
process="@this"
actionListener="#{reagentMngController.onNewBtnClick}"
@@ -66,7 +66,9 @@
<p:commandButton value="耗材导入" styleClass="import-btn" onclick="importReagent2()"
></p:commandButton>
<a href="resources/template/耗材导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
- <script>
+ <p:commandButton value="导出" styleClass="new-btn" ajax="false" id="exportButton" widgetVar="exportButton"
+ actionListener="#{reagentMngController.export2Excel}" />
+ <script type="text/javascript">
function importReagent(){
$("#reagentMngForm\\:importReagentBtn_input").click();
}
@@ -127,6 +129,10 @@
<p:column headerText="含税售价">
<h:outputText value="#{row.price}"></h:outputText>
</p:column>
+
+ <p:column headerText="密度g/ml" rendered="#{reagentMngController.type == 1}">
+ <h:outputText value="#{row.density}" decimalPlaces="4" minValue="0" maxlength="6" ></h:outputText>
+ </p:column>
<!--<p:column headerText="每箱数量">
<h:outputText value="#{row.perBox}"></h:outputText>
</p:column>
@@ -141,6 +147,9 @@
</p:column>
<p:column headerText="安全库存" rendered="#{reagentMngController.type == 1}">
<h:outputText value="#{row.safetynum}" ></h:outputText>
+ </p:column>
+ <p:column headerText="管制品" rendered="#{reagentMngController.type == 1}">
+ <h:outputText value="#{row.controlProductsName}" ></h:outputText>
</p:column>
<!-- <p:column headerText="库存">-->
<!-- <h:outputText value="#{row.reserve}"></h:outputText>-->
@@ -162,6 +171,7 @@
update="@form" auto="true" sizeLimit="5000000"
mode="advanced"/>
</div>
+
</h:form>
<p:dialog modal="true" header="#{reagentMngController.action==constants.ACTION_ADD?'新建':'修改'}" appendTo="@(body)"
@@ -382,7 +392,7 @@
</p:column>
<p:column>
<p:inputNumber value="#{reagentMngController.sysReagent.price}"
- decimalPlaces="2" minValue="0" maxlength="10"
+ decimalPlaces="4" minValue="0" maxlength="10"
required="true" requiredMessage="请输入含税售价"></p:inputNumber>
</p:column>
<p:column>
@@ -450,6 +460,17 @@
<f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_CONTROL_PRODUCTS)}"
var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
</p:selectOneMenu>-->
+ </p:row>
+
+ <p:row rendered="#{reagentMngController.action == constants.ACTION_ADD or reagentMngController.sysReagent.type == 1}">
+ <p:column>
+ <p:outputLabel value="密度g/ml"/>
+ </p:column>
+ <p:column>
+ <p:inputNumber value="#{reagentMngController.sysReagent.density}"
+ decimalPlaces="4" minValue="0" maxlength="6"
+ />
+ </p:column>
</p:row>
<!--<p:row>
<p:column>
@@ -528,5 +549,7 @@
</p:panel>
</h:form>
</p:dialog>
+
+
</ui:composition>
</html>
--
Gitblit v1.9.2