From d1e49b501683db8593dd2dda9eb5426feee1f6cb Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 22 十月 2021 15:33:44 +0800
Subject: [PATCH] 备货领取：补贴条码自动生成
---
src/main/webapp/warehouse_reagent_use.xhtml | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index 5232d75..ee77eaa 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;
@@ -204,12 +204,12 @@
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
- <div id="printTarget">
- <div style="margin: 11mm 27mm 0mm 30mm;">
+ <div id="printTarget" style="margin-right: -51px;">
+ <div style="margin: 25mm 17mm 0mm 15mm;">
<h:form id="printDialog" style="width: 1100px">
- <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
- <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
<div>
<div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
<div style="width: 98px;">单据编号:</div>
@@ -303,7 +303,7 @@
<p:commandButton value="关闭"
process="@this"
styleClass="yes-btn"
- actionListener="#{warehouseStockMngController.onCancelBtnClick}"
+ actionListener="#{warehouseStockMngController.closeDialog2}"
style="position: relative;left: 20px;"
update=":centerRootPanel"
oncomplete="PF('printDialog').hide()">
@@ -343,7 +343,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 +367,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