From 798aa9213a565c6c5ffb411e3cef40a10f99e9d1 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 31 三月 2023 09:16:53 +0800
Subject: [PATCH] 新疆绿色智能综合研究所补充
---
src/main/webapp/reagent_mng.xhtml | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/reagent_mng.xhtml b/src/main/webapp/reagent_mng.xhtml
index d537c15..c7f94c7 100644
--- a/src/main/webapp/reagent_mng.xhtml
+++ b/src/main/webapp/reagent_mng.xhtml
@@ -15,7 +15,7 @@
<p:panel styleClass="center-header">
<p:outputLabel styleClass="title" value="试剂管理"></p:outputLabel>
- <p:panelGrid styleClass="filter" columns="9">
+ <p:panelGrid styleClass="filter" columns="12">
<p:outputLabel value="名称："></p:outputLabel>
<p:inputText value="#{reagentMngController.name}"></p:inputText>
<p:outputLabel value="CAS："></p:outputLabel>
@@ -31,11 +31,15 @@
<f:selectItems value="#{reagentMngController.typeList}" var="item"
itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems>
</p:selectOneMenu>
+
+ <p:outputLabel value="产品编号："></p:outputLabel>
+ <p:inputText value="#{reagentMngController.productSn}"></p:inputText>
+
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
</p:panel>
<p:panel styleClass="center-body">
- <p:panelGrid columns="5" styleClass="btn">
+ <p:panelGrid columns="9" styleClass="btn">
<p:commandButton value="新建" styleClass="new-btn"
process="@this"
actionListener="#{reagentMngController.onNewBtnClick}"
@@ -51,11 +55,20 @@
update="@form">
<p:confirm header="确认" message="确认操作？"></p:confirm>
</p:commandButton>
+ <p:commandButton value="安全库存" styleClass="del-btn"
+ process="@form"
+ actionListener="#{reagentMngController.openUpdateSafetyNumDialog}"
+ update=":dialogForm-safetynum">
+ </p:commandButton>
<p:commandButton value="试剂导入" styleClass="import-btn" onclick="importReagent()"
- ></p:commandButton>
+ ></p:commandButton>
+ <a href="resources/template/试剂导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
<p:commandButton value="耗材导入" styleClass="import-btn" onclick="importReagent2()"
></p:commandButton>
- <script>
+ <a href="resources/template/耗材导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
+ <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();
}
@@ -86,6 +99,9 @@
<p:column headerText="名称">
<h:outputText value="#{row.name}"></h:outputText>
</p:column>
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.productSn}"></h:outputText>
+ </p:column>
<p:column headerText="CAS">
<h:outputText value="#{row.cas}"></h:outputText>
</p:column>
@@ -113,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>
@@ -125,12 +145,18 @@
<p:column headerText="每箱数量">
<h:outputText value="#{row.perBox}"></h:outputText>
</p:column>
- <p:column headerText="库存">
- <h:outputText value="#{row.reserve}"></h:outputText>
- </p:column>
- <p:column headerText="货期">
- <h:outputText value="#{row.deadline}"></h:outputText>
- </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>-->
+<!-- </p:column>-->
+<!-- <p:column headerText="货期">-->
+<!-- <h:outputText value="#{row.deadline}"></h:outputText>-->
+<!-- </p:column>-->
</p:dataTable>
</p:panel>
<div style="display: none" id='importDv'>
@@ -145,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)"
@@ -174,7 +201,7 @@
</p:column>
<p:column>
<p:inputText value="#{reagentMngController.sysReagent.cas}" maxlength="100"
- required="true" requiredMessage="请输入CAS"></p:inputText>
+ required="true" requiredMessage="请输入CAS" onkeyup="this.value=this.value.replace(/\s/g,'')"></p:inputText>
</p:column>
</p:row>
<p:row>
@@ -434,6 +461,17 @@
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>
<p:outputLabel value="种类"></p:outputLabel>
@@ -456,5 +494,62 @@
</p:panel>
</h:form>
</p:dialog>
+
+ <p:dialog modal="true" header="设置安全库存" appendTo="@(body)"
+ id="dialog-setSafetynum" widgetVar="dialog-setSafetynum"
+ resizable="false" width="1000">
+ <h:form id="dialogForm-safetynum">
+ <p:panelGrid styleClass="content2 grid-padding-bottom2">
+ <p:row>
+ <p:column>
+ <p:outputLabel value="试剂名称"/>
+ </p:column>
+ <p:column>
+ <p:inputText value="#{reagentMngController.sysReagent.name}"
+ maxlength="100"
+ disabled="true" />
+ </p:column>
+ <p:column>
+ <p:outputLabel value="CAS"/>
+ </p:column>
+ <p:column>
+ <p:inputText value="#{reagentMngController.sysReagent.cas}"
+ maxlength="100"
+ disabled="true"/>
+ </p:column>
+ </p:row>
+ <p:row>
+ <p:column>
+ <p:outputLabel value="产品编号"/>
+ </p:column>
+ <p:column>
+ <p:inputText value="#{reagentMngController.sysReagent.productSn}"
+ maxlength="100"
+ disabled="true"/>
+
+ </p:column>
+
+ <p:column>
+ <p:outputLabel value="安全库存"/>
+ </p:column>
+ <p:column>
+ <p:inputNumber value="#{reagentMngController.sysReagent.safetynum}"
+ minValue="0"
+ decimalPlaces="0"
+ maxlength="100"/>
+
+ </p:column>
+ </p:row>
+ </p:panelGrid>
+ <p:panel styleClass="btn">
+ <p:commandButton value="保存" actionListener="#{reagentMngController.updateSafetyNum}"
+ process="@form" update=":reagentMngForm:reagentMngDataTable">
+ <p:confirm header="确认" message="确认操作？"/>
+ </p:commandButton>
+ </p:panel>
+ </h:form>
+ </p:dialog>
+
+
</ui:composition>
</html>
--
Gitblit v1.9.2