From ea5cbe91b94e48e9f63947d01decdf919848ae91 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 17:35:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/webapp/warehouse_reagent_use_person.xhtml | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/warehouse_reagent_use_person.xhtml b/src/main/webapp/warehouse_reagent_use_person.xhtml
index 5a86db5..e580c46 100644
--- a/src/main/webapp/warehouse_reagent_use_person.xhtml
+++ b/src/main/webapp/warehouse_reagent_use_person.xhtml
@@ -45,7 +45,6 @@
<p:outputLabel value="实验室试剂柜："></p:outputLabel>
<p:selectOneMenu value="#{warehouseStockMngController.laboratoryContainerId}" id="stacks"
>
- <f:ajax listener="#{warehouseStockMngController.setContainerId}"/>
<f:selectItems value="#{warehouseStockMngController.laboratoryContainers}"
var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
</p:selectOneMenu>
@@ -58,8 +57,7 @@
<p:commandButton value="重置" process="@this" update="@form"
actionListener="#{warehouseStockMngController.onResetBtnClick}"
styleClass="reset-btn"></p:commandButton>
- <p:commandButton value="保存" process="@this" update=":centerRootPanel"
- immediate="true"
+ <p:commandButton value="保存" process="@form" update=":centerRootPanel"
actionListener="#{warehouseStockMngController.onSaveBtnClickForPerson}"
styleClass="save-btn">
<p:confirm header="确认" message="确认操作？"></p:confirm>
@@ -111,8 +109,7 @@
</p:column>
<p:column headerText="条形码">
- <p:commandButton value="操作" styleClass="edit-btn" process="@this"
- immediate="true"
+ <p:commandButton value="操作" styleClass="edit-btn" process="@form"
actionListener="#{warehouseStockMngController.onReagentCodeBtnClickForPerson(row)}"
update=":reagentCodeDialogForPerson,@(.startReagentCode),@(.endReagentCode)">
</p:commandButton>
--
Gitblit v1.9.2