From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/webapp/warehouse_reagent_use.xhtml | 112 +++++++++++++++++++++++++++-----------------------------
1 files changed, 54 insertions(+), 58 deletions(-)
diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index df2a1bf..4dbcc6a 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -32,12 +32,7 @@
</p:column>
</p:autoComplete>
- <!-- <p:outputLabel value="课题名称："></p:outputLabel>
- <p:selectOneMenu value="#{warehouseStockMngController.projectNum}"
- required="true" requiredMessage="请选择课题名称">
- <f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_PROJECT_NUM)}"
- var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>-->
+
<p:outputLabel value="实验室：" style="margin-left: 20px"></p:outputLabel>
<p:selectOneMenu value="#{warehouseStockMngController.laboratoryId}"
id="experments">
@@ -117,6 +112,7 @@
if (number === "" || number> all.size()){
alert("输入不合法");
}
+ console.log(number,'number')
//选中前面几个
for (var i = 0;i < number;i++){
all.eq(i)['0'].checked = true;
@@ -172,12 +168,12 @@
<p:column headerText="规格">
<h:outputText
- value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"></h:outputText>
+ value="#{row.reagent.reagentFormat}"></h:outputText>
</p:column>
<p:column headerText="包装">
<h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"></h:outputText>
+ value="#{''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)}"></h:outputText>
</p:column>
<p:column headerText="批号">
@@ -358,59 +354,59 @@
widgetVar="reagentCodeDialog" resizable="false" width="800" class="ui-dialog">
<p:tabView dynamic="true" style="margin-left: 26px">
- <p:tab title="补贴条码">
- <h:form id="reagentCodeDialogForm2">
- <!--<p:panel styleClass="center-header content2">-->
- <p:panelGrid styleClass="center-header content2">
- <p:row>
- <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: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">-->
-<!-- <f:selectItems value="#{warehouseStockMngController.showCodes}" var="code" itemValue="#{code}" />-->
+<!-- <p:tab title="补贴条码">-->
+<!-- <h:form id="reagentCodeDialogForm2">-->
+<!-- <!–<p:panel styleClass="center-header content2">–>-->
+<!-- <p:panelGrid styleClass="center-header content2">-->
+<!-- <p:row>-->
+<!-- <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: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">–>-->
+<!--<!– <f:selectItems value="#{warehouseStockMngController.showCodes}" var="code" itemValue="#{code}" />–>-->
-<!-- <p:column>-->
-<!-- <f:facet name="header">-->
-<!-- <h:outputText value="Name"/>-->
-<!-- </f:facet>-->
-<!-- </p:column>-->
+<!--<!– <p:column>–>-->
+<!--<!– <f:facet name="header">–>-->
+<!--<!– <h:outputText value="Name"/>–>-->
+<!--<!– </f:facet>–>-->
+<!--<!– </p:column>–>-->
-<!-- <f:facet name="footer">-->
-<!-- <p:separator />-->
-<!-- <h:outputText value="#{warehouseStockMngController.showCodes.size()} themes" style="font-weight:bold;"/>-->
-<!-- </f:facet>-->
-<!-- </p:selectOneMenu>-->
+<!--<!– <f:facet name="footer">–>-->
+<!--<!– <p:separator />–>-->
+<!--<!– <h:outputText value="#{warehouseStockMngController.showCodes.size()} themes" style="font-weight:bold;"/>–>-->
+<!--<!– </f:facet>–>-->
+<!--<!– </p:selectOneMenu>–>-->
+<!--<!– </p:column>–>-->
+<!-- </p:row>-->
+<!-- <p:row>-->
+<!-- <p:column><p:outputLabel value="条形码开始">-->
+<!-- </p:outputLabel></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:row>
- <p:row>
- <p:column><p:outputLabel value="条形码开始">
- </p:outputLabel></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>
- </p:panelGrid>
- <!--</p:panel>-->
- <p:panel styleClass="btn" style="text-align: right">
- <p:commandButton value="确定"
- actionListener="#{warehouseStockMngController.onYesBtnClick2}"
- process="@form"
- update=":warehouseReagentUseForm:warehouseReagentUseDataTable"
- styleClass="yes-btn">
- </p:commandButton>
- </p:panel>
- </h:form>
- </p:tab>
+<!-- <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>-->
+<!-- </p:panelGrid>-->
+<!-- <!–</p:panel>–>-->
+<!-- <p:panel styleClass="btn" style="text-align: right">-->
+<!-- <p:commandButton value="确定"-->
+<!-- actionListener="#{warehouseStockMngController.onYesBtnClick2}"-->
+<!-- process="@form"-->
+<!-- update=":warehouseReagentUseForm:warehouseReagentUseDataTable"-->
+<!-- styleClass="yes-btn">-->
+<!-- </p:commandButton>-->
+<!-- </p:panel>-->
+<!-- </h:form>-->
+<!-- </p:tab>-->
<p:tab title="库中领取">
<h:form id="reagentCodeDialogForm">
<p:panel styleClass="center-header content2">
@@ -433,7 +429,7 @@
layout="grid" columns="4" onchange="change(this)">
<f:selectItems
value="#{warehouseStockMngController.reagentStatusSelectList}" var="item"
- itemLabel="#{item.reagentCode}" itemValue="#{item.id}" />
+ itemLabel="#{item.reagentCode}" itemValue="#{item.reagentCode}" />
</p:selectManyCheckbox>
</p:panel>
--
Gitblit v1.9.2