From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/webapp/reagent_mng.xhtml | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/reagent_mng.xhtml b/src/main/webapp/reagent_mng.xhtml
index 5c0222d..01a8c83 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="7" styleClass="btn">
+ <p:panelGrid columns="9" styleClass="btn">
<p:commandButton value="新建" styleClass="new-btn"
process="@this"
actionListener="#{reagentMngController.onNewBtnClick}"
@@ -55,13 +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>
<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>
<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();
}
@@ -134,6 +141,12 @@
<p:column headerText="每箱数量">
<h:outputText value="#{row.perBox}"></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>-->
@@ -154,6 +167,7 @@
update="@form" auto="true" sizeLimit="5000000"
mode="advanced"/>
</div>
+
</h:form>
<p:dialog modal="true" header="#{reagentMngController.action==constants.ACTION_ADD?'新建':'修改'}" appendTo="@(body)"
@@ -465,5 +479,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