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/order_mng_chanege_code.xhtml | 113 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 60 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/order_mng_chanege_code.xhtml b/src/main/webapp/order_mng_chanege_code.xhtml
index 31f10a1..414ef47 100644
--- a/src/main/webapp/order_mng_chanege_code.xhtml
+++ b/src/main/webapp/order_mng_chanege_code.xhtml
@@ -71,15 +71,15 @@
</p:column>
<p:column headerText="厂家" width="80">
- <h:outputText value="#{row.reagent.productHomeName}"></h:outputText>
+ <h:outputText value="#{row.reagent.productHome}"></h:outputText>
</p:column>
<p:column headerText="规格" width="200">
- <h:outputText value="#{row.reagent!=null?baseMetaService.getBaseMetaValue(row.reagent.reagentFormat):''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?row.reagent.reagentFormat:''}"></h:outputText>
</p:column>
<p:column headerText="包装" width="80">
- <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)):''}"></h:outputText>
</p:column>
<p:column headerText="申购数量" width="80">
@@ -111,13 +111,13 @@
<p:column headerText="批号" width="120">
<!--<p:cellEditor>-->
- <!--<f:facet name="output">-->
- <h:outputText value="#{row.articleNumber}" />
- <!--</f:facet>-->
- <!--<f:facet name="input">-->
- <!--<p:inputText value="#{row.articleNumber}" maxlength="32" style="width: 100%"-->
- <!--required="true" requiredMessage="请输入批号"/>-->
- <!--</f:facet>-->
+ <!--<f:facet name="output">-->
+ <h:outputText value="#{row.articleNumber}" />
+ <!--</f:facet>-->
+ <!--<f:facet name="input">-->
+ <!--<p:inputText value="#{row.articleNumber}" maxlength="32" style="width: 100%"-->
+ <!--required="true" requiredMessage="请输入批号"/>-->
+ <!--</f:facet>-->
<!--</p:cellEditor>-->
</p:column>
@@ -127,9 +127,13 @@
<h:outputText value="#{row.startReagentCode}" />
</f:facet>
<f:facet name="input">
- <p:inputNumber value="#{row.startReagentCode}" maxlength="32" style="width: 100%"
- required="true" requiredMessage="请输入条形码开始"
- decimalPlaces="0" thousandSeparator=""/>
+ <p:inputText value="#{row.startReagentCode}" style="width: 100%" required="true" requiredMessage="请输入条形码开始"
+ maxlength="24"
+ size="24"
+ decimalPlaces="0" thousandSeparator=""
+ onkeyup="this.value = this.value.replace(/\D/g,'')" >
+ </p:inputText>
+
</f:facet>
</p:cellEditor>
</p:column>
@@ -140,66 +144,69 @@
<h:outputText value="#{row.endReagentCode}" />
</f:facet>
<f:facet name="input">
- <p:inputNumber value="#{row.endReagentCode}" maxlength="32" style="width: 100%"
- required="true" requiredMessage="请输入条形码结束"
- decimalPlaces="0" thousandSeparator=""/>
+ <p:inputText value="#{row.endReagentCode}" style="width: 100%" required="true" requiredMessage="请输入条形码结束"
+ maxlength="24"
+ size="24"
+ decimalPlaces="0" thousandSeparator=""
+ onkeyup="this.value = this.value.replace(/\D/g,'')" >
+ </p:inputText>
</f:facet>
</p:cellEditor>
</p:column>
<p:column headerText="仓库名" width="120">
<!--<p:cellEditor>-->
- <!--<f:facet name="output">-->
- <h:outputText value="#{orderMngController.formatWarehouseName(row.houseId)}" />
- <!--</f:facet>-->
- <!--<f:facet name="input">-->
- <!--<p:selectOneMenu value="#{row.houseId}" style="width: 110px"-->
- <!--required="true" requiredMessage="请选择仓库">-->
- <!--<p:ajax event="change" process="@this"-->
- <!--listener="#{orderMngController.onWarehouseSelectChange(row.houseId)}"-->
- <!--update="containerSelect,placeSelect"></p:ajax>-->
- <!--<f:selectItems value="#{orderMngController.warehouseList}" var="item"-->
- <!--itemValue="#{item.id}" itemLabel="#{item.name}"></f:selectItems>-->
- <!--</p:selectOneMenu>-->
- <!--</f:facet>-->
+ <!--<f:facet name="output">-->
+ <h:outputText value="#{orderMngController.formatWarehouseName(row.houseId)}" />
+ <!--</f:facet>-->
+ <!--<f:facet name="input">-->
+ <!--<p:selectOneMenu value="#{row.houseId}" style="width: 110px"-->
+ <!--required="true" requiredMessage="请选择仓库">-->
+ <!--<p:ajax event="change" process="@this"-->
+ <!--listener="#{orderMngController.onWarehouseSelectChange(row.houseId)}"-->
+ <!--update="containerSelect,placeSelect"></p:ajax>-->
+ <!--<f:selectItems value="#{orderMngController.warehouseList}" var="item"-->
+ <!--itemValue="#{item.id}" itemLabel="#{item.name}"></f:selectItems>-->
+ <!--</p:selectOneMenu>-->
+ <!--</f:facet>-->
<!--</p:cellEditor>-->
</p:column>
<p:column headerText="货柜名" width="120">
<!--<p:cellEditor>-->
- <!--<f:facet name="output">-->
- <h:outputText value="#{orderMngController.formatWarehouseContainerName(row.containerId)}" />
- <!--</f:facet>-->
- <!--<f:facet name="input">-->
- <!--<p:selectOneMenu id="containerSelect" value="#{row.containerId}" style="width: 110px"-->
- <!--required="true" requiredMessage="请选择货柜">-->
- <!--<p:ajax event="change" process="@this"-->
- <!--listener="#{orderMngController.onWarehouseContainerSelectChange(row.containerId)}"-->
- <!--update="placeSelect"></p:ajax>-->
- <!--<f:selectItems value="#{orderMngController.warehouseContainerList}" var="item"-->
- <!--itemValue="#{item.id}" itemLabel="#{item.containerCode}"></f:selectItems>-->
- <!--</p:selectOneMenu>-->
- <!--</f:facet>-->
+ <!--<f:facet name="output">-->
+ <h:outputText value="#{orderMngController.formatWarehouseContainerName(row.containerId)}" />
+ <!--</f:facet>-->
+ <!--<f:facet name="input">-->
+ <!--<p:selectOneMenu id="containerSelect" value="#{row.containerId}" style="width: 110px"-->
+ <!--required="true" requiredMessage="请选择货柜">-->
+ <!--<p:ajax event="change" process="@this"-->
+ <!--listener="#{orderMngController.onWarehouseContainerSelectChange(row.containerId)}"-->
+ <!--update="placeSelect"></p:ajax>-->
+ <!--<f:selectItems value="#{orderMngController.warehouseContainerList}" var="item"-->
+ <!--itemValue="#{item.id}" itemLabel="#{item.containerCode}"></f:selectItems>-->
+ <!--</p:selectOneMenu>-->
+ <!--</f:facet>-->
<!--</p:cellEditor>-->
</p:column>
<p:column headerText="货柜位置" width="120">
<!--<p:cellEditor>-->
- <!--<f:facet name="output">-->
- <h:outputText value="#{orderMngController.formatWarehouseContainerPlaceName(row.placeId)}" />
- <!--</f:facet>-->
- <!--<f:facet name="input">-->
- <!--<p:selectOneMenu id="placeSelect" value="#{row.placeId}" style="width: 110px"-->
- <!--required="true" requiredMessage="请选择货柜位置">-->
- <!--<f:selectItems value="#{orderMngController.warehouseContainerPlaceList}" var="item"-->
- <!--itemValue="#{item.id}" itemLabel="#{item.metaValue}"></f:selectItems>-->
- <!--</p:selectOneMenu>-->
- <!--</f:facet>-->
+ <!--<f:facet name="output">-->
+ <h:outputText value="#{orderMngController.formatWarehouseContainerPlaceName(row.placeId)}" />
+ <!--</f:facet>-->
+ <!--<f:facet name="input">-->
+ <!--<p:selectOneMenu id="placeSelect" value="#{row.placeId}" style="width: 110px"-->
+ <!--required="true" requiredMessage="请选择货柜位置">-->
+ <!--<f:selectItems value="#{orderMngController.warehouseContainerPlaceList}" var="item"-->
+ <!--itemValue="#{item.id}" itemLabel="#{item.metaValue}"></f:selectItems>-->
+ <!--</p:selectOneMenu>-->
+ <!--</f:facet>-->
<!--</p:cellEditor>-->
</p:column>
<p:column width="40">
-
+
<p:rowEditor/>
</p:column>
--
Gitblit v1.9.2