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_container_mng.xhtml | 176 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 101 insertions(+), 75 deletions(-)
diff --git a/src/main/webapp/warehouse_container_mng.xhtml b/src/main/webapp/warehouse_container_mng.xhtml
index a5f388b..53946f2 100644
--- a/src/main/webapp/warehouse_container_mng.xhtml
+++ b/src/main/webapp/warehouse_container_mng.xhtml
@@ -58,9 +58,9 @@
<h:outputText value="#{row.warehouseName}"></h:outputText>
</p:column>
- <p:column headerText="主控名">
- <h:outputText value="#{row.controllerName}"></h:outputText>
- </p:column>
+<!-- <p:column headerText="主控名">-->
+<!-- <h:outputText value="#{row.controllerName}"></h:outputText>-->
+<!-- </p:column>-->
<p:column headerText="货柜条码">
<h:outputText value="#{row.containerCode}"></h:outputText>
@@ -87,79 +87,105 @@
<p:dialog modal="true"
header="#{warehouseContainerMngController.action==constants.ACTION_ADD?'新建':'修改'}"
appendTo="@(body)" id="dialog" widgetVar="dialog" resizable="false"
- width="800">
+ width="600">
<h:form id="dialogForm">
- <p:panelGrid columns="4" styleClass="content2 grid-padding-bottom2">
-
- <p:outputLabel value="仓库"></p:outputLabel>
- <p:selectOneMenu
- value="#{warehouseContainerMngController.sysWarehouseContainer.warehouseId}"
- required="true" requiredMessage="请选择仓库" disabled="#{warehouseContainerMngController.action==constants.ACTION_ADD?false:true}">
- <f:selectItems value="#{sysWarehouseService.getAllSysWarehouseList()}"
- var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>
- <p:outputLabel value="主控名"></p:outputLabel>
- <p:selectOneMenu
- value="#{warehouseContainerMngController.sysWarehouseContainer.controllerCode}"
- required="true" requiredMessage="请选择主控设备">
- <f:selectItems value="#{warehouseContainerMngController.controllers}" var="item"
- itemLabel="#{item.controllerName}" itemValue="#{item.controllerCode}"></f:selectItems>
- </p:selectOneMenu>
- <p:outputLabel value="货柜条码"></p:outputLabel>
- <p:inputText
- value="#{warehouseContainerMngController.sysWarehouseContainer.containerCode}"
- maxlength="100" disabled="#{warehouseContainerMngController.action==constants.ACTION_ADD?false:true}"></p:inputText>
-
- <p:outputLabel value="货柜类型"></p:outputLabel>
- <p:selectOneMenu
- value="#{warehouseContainerMngController.sysWarehouseContainer.type}"
- required="true" requiredMessage="请选择货柜类型" disabled="#{warehouseContainerMngController.action==constants.ACTION_ADD?false:true}">
- <p:ajax event="change" listener="#{warehouseContainerMngController.containerTypeChanged}" process="@form" update="@form"/>
- <f:selectItems
- value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_CONTAINER_TYPE)}"
- var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>
-
- <p:outputLabel value="货柜状态码"></p:outputLabel>
- <p:inputText
- value="#{warehouseContainerMngController.sysWarehouseContainer.infoCode}"
- maxlength="100"></p:inputText>
-
- <p:outputLabel value="货柜结构"></p:outputLabel>
- <p:selectOneMenu
- value="#{warehouseContainerMngController.sysWarehouseContainer.structure}"
- required="true" requiredMessage="请选择货柜结构">
- <f:selectItems
- value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_CONTAINER_STRUCTURE)}"
- var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>
-
- <p:outputLabel value="货柜名称"></p:outputLabel>
- <p:inputText
- value="#{warehouseContainerMngController.sysWarehouseContainer.name}"
- maxlength="100"></p:inputText>
-
- <p:outputLabel value="左门危险性质" rendered="#{warehouseContainerMngController.characterRenderedFlag==1}"></p:outputLabel>
- <p:selectOneMenu
- value="#{warehouseContainerMngController.sysWarehouseContainer.characterLeft}"
- required="#{warehouseContainerMngController.characterRenderedFlag==1}"
- requiredMessage="左门危险性质"
- rendered="#{warehouseContainerMngController.characterRenderedFlag==1}">
- <f:selectItems
- value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_REAGENT_CHARACTER)}"
- var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>
-
- <p:outputLabel value="右门危险性质" rendered="#{warehouseContainerMngController.characterRenderedFlag==1}"></p:outputLabel>
- <p:selectOneMenu
- value="#{warehouseContainerMngController.sysWarehouseContainer.characterRight}"
- required="#{warehouseContainerMngController.characterRenderedFlag==1}"
- requiredMessage="右门危险性质"
- rendered="#{warehouseContainerMngController.characterRenderedFlag==1}">
- <f:selectItems
- value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_REAGENT_CHARACTER)}"
- var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>
+ <p:panelGrid columns="2" styleClass="content2 grid-padding-bottom2">
+ <p:row>
+ <p:column>
+ <p:outputLabel value="仓库"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:selectOneMenu
+ value="#{warehouseContainerMngController.sysWarehouseContainer.warehouseId}"
+ required="true" requiredMessage="请选择仓库" disabled="#{warehouseContainerMngController.action==constants.ACTION_ADD?false:true}">
+ <f:selectItems value="#{sysWarehouseService.getAllSysWarehouseList()}"
+ var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
+ </p:selectOneMenu>
+ </p:column>
+ <p:column>
+ <p:outputLabel value="货柜条码"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:inputText
+ value="#{warehouseContainerMngController.sysWarehouseContainer.containerCode}"
+ maxlength="100" disabled="#{warehouseContainerMngController.action==constants.ACTION_ADD?false:true}"></p:inputText>
+ </p:column>
+ </p:row>
+ <p:row>
+ <p:column>
+ <p:outputLabel value="货柜类型"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:selectOneMenu
+ value="#{warehouseContainerMngController.sysWarehouseContainer.type}"
+ required="true" requiredMessage="请选择货柜类型" disabled="#{warehouseContainerMngController.action==constants.ACTION_ADD?false:true}">
+ <p:ajax event="change" listener="#{warehouseContainerMngController.containerTypeChanged}" process="@form" update="@form"/>
+ <f:selectItems
+ value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_CONTAINER_TYPE)}"
+ var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
+ </p:selectOneMenu>
+ </p:column>
+ <p:column>
+ <p:outputLabel value="货柜状态码"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:inputText
+ value="#{warehouseContainerMngController.sysWarehouseContainer.infoCode}"
+ maxlength="100"></p:inputText>
+ </p:column>
+ </p:row>
+ <p:row>
+ <p:column>
+ <p:outputLabel value="货柜结构"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:selectOneMenu
+ value="#{warehouseContainerMngController.sysWarehouseContainer.structure}"
+ required="true" requiredMessage="请选择货柜结构">
+ <f:selectItems
+ value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_CONTAINER_STRUCTURE)}"
+ var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
+ </p:selectOneMenu>
+ </p:column>
+ <p:column>
+ <p:outputLabel value="货柜名称"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:inputText
+ value="#{warehouseContainerMngController.sysWarehouseContainer.name}"
+ maxlength="100"></p:inputText>
+ </p:column>
+ </p:row>
+ <p:row>
+ <p:column>
+ <p:outputLabel value="左门危险性质" rendered="#{warehouseContainerMngController.characterRenderedFlag==1}"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:selectOneMenu
+ value="#{warehouseContainerMngController.sysWarehouseContainer.characterLeft}"
+ required="#{warehouseContainerMngController.characterRenderedFlag==1}"
+ requiredMessage="左门危险性质"
+ rendered="#{warehouseContainerMngController.characterRenderedFlag==1}">
+ <f:selectItems
+ value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_REAGENT_CHARACTER)}"
+ var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
+ </p:selectOneMenu>
+ </p:column>
+ <p:column>
+ <p:outputLabel value="右门危险性质" rendered="#{warehouseContainerMngController.characterRenderedFlag==1}"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:selectOneMenu
+ value="#{warehouseContainerMngController.sysWarehouseContainer.characterRight}"
+ required="#{warehouseContainerMngController.characterRenderedFlag==1}"
+ requiredMessage="右门危险性质"
+ rendered="#{warehouseContainerMngController.characterRenderedFlag==1}">
+ <f:selectItems
+ value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_REAGENT_CHARACTER)}"
+ var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
+ </p:selectOneMenu>
+ </p:column>
+ </p:row>
</p:panelGrid>
<p:panel styleClass="btn">
--
Gitblit v1.9.2