From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/webapp/warehouse_container_mng.xhtml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/warehouse_container_mng.xhtml b/src/main/webapp/warehouse_container_mng.xhtml
index 0aba6e6..a5f388b 100644
--- a/src/main/webapp/warehouse_container_mng.xhtml
+++ b/src/main/webapp/warehouse_container_mng.xhtml
@@ -58,6 +58,10 @@
<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.containerCode}"></h:outputText>
</p:column>
@@ -90,7 +94,7 @@
<p:outputLabel value="仓库"></p:outputLabel>
<p:selectOneMenu
value="#{warehouseContainerMngController.sysWarehouseContainer.warehouseId}"
- required="true" requiredMessage="请选择仓库">
+ 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>
@@ -104,12 +108,12 @@
<p:outputLabel value="货柜条码"></p:outputLabel>
<p:inputText
value="#{warehouseContainerMngController.sysWarehouseContainer.containerCode}"
- maxlength="100"></p:inputText>
+ 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="请选择货柜类型">
+ 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)}"
--
Gitblit v1.9.2