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_ruku.xhtml | 63 +++++++++----------------------
1 files changed, 19 insertions(+), 44 deletions(-)
diff --git a/src/main/webapp/order_mng_ruku.xhtml b/src/main/webapp/order_mng_ruku.xhtml
index f472738..a60cec2 100644
--- a/src/main/webapp/order_mng_ruku.xhtml
+++ b/src/main/webapp/order_mng_ruku.xhtml
@@ -9,7 +9,11 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core">
-<head></head>
+<!--<h:head>-->
+<!-- <f:facet name="first">-->
+<!-- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>-->
+<!-- </f:facet>-->
+<!--</h:head>-->
<ui:composition>
<h:form id="orderMngRukuForm">
<p:panel styleClass="center-header">
@@ -74,15 +78,15 @@
<h:outputText value="#{row.reagent!=null?row.reagent.supplierName:''}"></h:outputText>
</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">
@@ -97,6 +101,13 @@
<p:column headerText="申购人" width="80">
<h:outputText value="#{row.applyUserName}"></h:outputText>
+ </p:column>
+ <p:column headerText="条形码开始" width="120">
+ <h:outputText value="#{row.startReagentCode}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="条形码结束" width="120">
+ <h:outputText value="#{row.endReagentCode}"></h:outputText>
</p:column>
<p:column headerText="到货数量" width="80">
@@ -123,37 +134,7 @@
</p:cellEditor>
</p:column>
- <p:column headerText="条形码开始" width="120">
- <p:cellEditor>
- <f:facet name="output">
- <h:outputText value="#{row.startReagentCode}" />
- </f:facet>
- <f:facet name="input">
- <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>
- <p:column headerText="条形码结束" width="120">
- <p:cellEditor>
- <f:facet name="output">
- <h:outputText value="#{row.endReagentCode}" />
- </f:facet>
- <f:facet name="input">
- <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>
@@ -165,7 +146,7 @@
required="true" requiredMessage="请选择仓库">
<p:ajax event="change" process="@this"
listener="#{orderMngController.onWarehouseSelectChange(row.houseId)}"
- update="containerSelect,placeSelect"></p:ajax>
+ update="containerSelect"></p:ajax>
<f:selectItems value="#{orderMngController.warehouseList}" var="item"
itemValue="#{item.id}" itemLabel="#{item.name}"></f:selectItems>
</p:selectOneMenu>
@@ -181,9 +162,7 @@
<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>
@@ -194,14 +173,10 @@
<p:column headerText="货柜位置" width="120">
<p:cellEditor>
<f:facet name="output">
- <h:outputText value="#{orderMngController.formatWarehouseContainerPlaceName(row.placeId)}" />
+ <h:outputText value="#{row.place}" />
</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>
+ <p:inputText value="#{row.place}" maxlength="32" style="width: 100%" required="true" requiredMessage="请输入货柜位置"/>
</f:facet>
</p:cellEditor>
</p:column>
--
Gitblit v1.9.2