From 4ad8653be79cb07fc7f450540ea20d82b3971b89 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 12 一月 2021 14:19:44 +0800
Subject: [PATCH] 模块：用户管理 修改：导入新增课题组,修改导入时插入的代码问题 提出：秦老师
---
src/main/webapp/warehouse_reagent_use.xhtml | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index b787822..744234c 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -261,7 +261,7 @@
</p:column>
<p:column headerText="包装" width="90px;" style="text-align: center;">
- <h:outputText value="#{row.mainMetering}" />
+ <h:outputText value="#{row.mainMetering==null?'':row.mainMetering}" />
</p:column>
<p:column headerText="数量" width="90px;" style="text-align: center;">
@@ -308,24 +308,24 @@
<p:column><p:inputNumber value="#{warehouseStockMngController.useNum}"
minValue="0" decimalPlaces="0"
required="true" requiredMessage="请输入领用数量" id="useNum"/></p:column>
- <p:column><p:outputLabel value="条码情况" /></p:column>
- <p:column><p:selectOneMenu id="advanced" panelStyle="width:180px"
- effect="fade" style="width:160px" filter="true" filterMatchMode="startsWith">
- <f:selectItems value="#{warehouseStockMngController.showCodes}" var="code" itemValue="#{code}" />
+<!-- <p:column><p:outputLabel value="条码情况" /></p:column>-->
+<!-- <p:column><p:selectOneMenu id="advanced" panelStyle="width:180px"-->
+<!-- effect="fade" style="width:160px" filter="true" filterMatchMode="startsWith">-->
+<!-- <f:selectItems value="#{warehouseStockMngController.showCodes}" var="code" itemValue="#{code}" />-->
- <p:column>
- <f:facet name="header">
- <h:outputText value="Name"/>
- </f:facet>
- </p:column>
+<!-- <p:column>-->
+<!-- <f:facet name="header">-->
+<!-- <h:outputText value="Name"/>-->
+<!-- </f:facet>-->
+<!-- </p:column>-->
- <f:facet name="footer">
- <p:separator />
- <h:outputText value="#{warehouseStockMngController.showCodes.size()} themes" style="font-weight:bold;"/>
- </f:facet>
- </p:selectOneMenu>
- </p:column>
+<!-- <f:facet name="footer">-->
+<!-- <p:separator />-->
+<!-- <h:outputText value="#{warehouseStockMngController.showCodes.size()} themes" style="font-weight:bold;"/>-->
+<!-- </f:facet>-->
+<!-- </p:selectOneMenu>-->
+<!-- </p:column>-->
</p:row>
<p:row>
<p:column><p:outputLabel value="条形码开始">
--
Gitblit v1.9.2