From 1bcc45b241b13da792a52fe1bb1d489a8aa7c14b Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 05 五月 2022 16:15:40 +0800
Subject: [PATCH] 邮箱转发 李向龙=>赵群

---
 src/main/webapp/warehouse_reagent_use.xhtml |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index 1e1f563..132eebc 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -24,7 +24,7 @@
 									var="item"
 									dropdown="true"
 									styleClass="apply-user-autocomplete"
-									itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : null}"
+									itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : ' '}"
 									itemValue="#{item.id}" forceSelection="true">
 						<p:ajax event="itemSelect" listener="#{warehouseStockMngController.resetLaboratory()}" process="@this" update="@this,experments,stacks" />
 						<p:column>
@@ -43,7 +43,7 @@
 						 id="experments">
 						<f:selectItems value="#{warehouseStockMngController.laboratory}"
 							var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
-						<f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" update="stacks"/>
+						<f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" render="stacks"/>
 					</p:selectOneMenu>
 					<p:outputLabel value="实验室试剂柜:"></p:outputLabel>
 					<p:selectOneMenu value="#{warehouseStockMngController.laboratoryContainerId}" id="stacks"
@@ -102,7 +102,7 @@
 							}
 
 						}
-						
+
 						function allSelected() {
 							selectFunc(num);
 							num++;
@@ -124,11 +124,11 @@
 										.children("span").removeClass("ui-icon-blank").addClass("ui-icon-check")
 							}
 						}
-						
+
 						function changeCount() {
 							$("#num").val($("#reagentCodeDialog td div[class*=ui-state-active]").size());
 						}
-						
+
 						function change(element) {
 							var selected = element.checked;
 							var num = 0;
@@ -237,7 +237,7 @@
 				</div>
 			</div>
 
-			<div style="margin-bottom: 20px;">
+			<div style="margin-bottom: 10px;">
 				<div style="display: inline-flex;">
 					<div style="width: 100px;margin-left: 10px;">课题组</div>
 					<div style="width: 300px;">#{warehouseStockMngController.printTable['project']}</div>
@@ -252,6 +252,16 @@
 						<input style="border: 0;" value="#{warehouseStockMngController.printTable['phone']}"/></div>
 				</div>
 			</div>
+
+            <div style="margin-bottom: 20px;">
+                <div style="display: inline-flex;">
+                    <div style="width: 100px;margin-left: 10px;">备注</div>
+                    <div style="">
+                        <p:inputText value="#{warehouseStockMngController.note}" style="width: 950px;">
+                        <p:ajax event="valueChange"   />
+                        </p:inputText></div>
+                </div>
+            </div>
 
 
 
@@ -343,7 +353,9 @@
 							<p:column><p:outputLabel value="领用数量:"></p:outputLabel></p:column>
 							<p:column><p:inputNumber value="#{warehouseStockMngController.useNum}"
 													 minValue="0" decimalPlaces="0"
-													 required="true" requiredMessage="请输入领用数量" id="useNum"/></p:column>
+													 required="true" requiredMessage="请输入领用数量" id="useNum">
+								<p:ajax event="change" listener="#{warehouseStockMngController.handleEvent2}" update="endReagentCode"/>
+						</p:inputNumber></p:column>
 <!--							<p:column><p:outputLabel  value="条码情况" /></p:column>-->
 <!--							<p:column><p:selectOneMenu id="advanced"   panelStyle="width:180px"-->
 <!--											 effect="fade"  style="width:160px" filter="true" filterMatchMode="startsWith">-->
@@ -365,11 +377,12 @@
 						</p:row>
 						<p:row>
 							<p:column><p:outputLabel value="条形码开始">
-								<p:commandLink value="自动生成" process="@this useNum startReagentCode" action="#{warehouseStockMngController.handleEvent2}"  update="endReagentCode" >
-
-								</p:commandLink>
 							</p:outputLabel></p:column>
-							<p:column><p:inputText id="startReagentCode" value="#{warehouseStockMngController.startReagentCode}" maxlength="32" required="true" requiredMessage="请输入条形码开始"/></p:column>
+							<p:column>
+								<p:inputText id="startReagentCode" value="#{warehouseStockMngController.startReagentCode}" maxlength="32" required="true" requiredMessage="请输入条形码开始">
+									<p:ajax event="change" listener="#{warehouseStockMngController.handleEvent2}" update="endReagentCode"/>
+								</p:inputText>
+							</p:column>
 							<p:column><p:outputLabel value="条形码结束"></p:outputLabel></p:column>
 							<p:column><p:inputText id="endReagentCode" value="#{warehouseStockMngController.endReagentCode}" maxlength="32" required="true" requiredMessage="请输入条形码结束"/></p:column>
 						</p:row>

--
Gitblit v1.9.2