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_mng.xhtml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/warehouse_mng.xhtml b/src/main/webapp/warehouse_mng.xhtml
index 15aabd3..391df19 100644
--- a/src/main/webapp/warehouse_mng.xhtml
+++ b/src/main/webapp/warehouse_mng.xhtml
@@ -67,6 +67,10 @@
<h:outputText
value="#{'楼号：'.concat(row.location1).concat(' - 地址号：'.concat(row.location2))}"></h:outputText>
</p:column>
+
+ <p:column headerText="负责部门">
+ <h:outputText value="#{baseMetaService.getBaseMetaValue(row.department)}"/>
+ </p:column>
</p:dataTable>
</p:panel>
</h:form>
@@ -87,7 +91,7 @@
<p:outputLabel value="仓库名"></p:outputLabel>
<p:inputText value="#{warehouseMngController.sysWarehouse.name}"
- maxlength="100" required="true" requiredMessage="请输入仓库名"></p:inputText>
+ maxlength="100" required="true" requiredMessage="请输入仓库名" disabled="#{warehouseMngController.action==constants.ACTION_ADD?false:true}"></p:inputText>
<p:outputLabel value="状态码"></p:outputLabel>
<p:inputText value="#{warehouseMngController.sysWarehouse.infoCode}"
@@ -104,6 +108,13 @@
<p:outputLabel value="地址号"></p:outputLabel>
<p:inputText value="#{warehouseMngController.sysWarehouse.location2}"
maxlength="100"></p:inputText>
+
+ <p:outputLabel value="负责部门"></p:outputLabel>
+ <p:selectOneMenu value="#{warehouseMngController.sysWarehouse.department}"
+ required="true" requiredMessage="请选择负责部门">
+ <f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_USER_DEPARTMENT)}"
+ var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
+ </p:selectOneMenu>
</p:panelGrid>
<p:panel styleClass="btn">
<p:commandButton value="保存"
--
Gitblit v1.9.2