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/sys_hazardous_waste.xhtml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/sys_hazardous_waste.xhtml b/src/main/webapp/sys_hazardous_waste.xhtml
index b078069..92ce344 100644
--- a/src/main/webapp/sys_hazardous_waste.xhtml
+++ b/src/main/webapp/sys_hazardous_waste.xhtml
@@ -19,7 +19,7 @@
<p:outputLabel value="开始时间："/>
<p:calendar value="#{hazardousWasteController.startTime}"
converter="timestampConvert"
- pattern="yyyy-MM-dd" locale="zh_CN"/>
+ pattern="yyyy-MM-dd" locale="zh_CN" />
<p:outputLabel value="结束时间："/>
<p:calendar value="#{hazardousWasteController.endTime}"
@@ -29,14 +29,14 @@
<p:outputLabel value="状态："/>
<p:selectOneMenu value="#{hazardousWasteController.status}">
<f:selectItems value="#{hazardousWasteController.statusList}" var="item"
- itemLabel="#{item}" itemValue="#{item}"/>
+ itemLabel="#{item}" itemValue="#{item}" />
</p:selectOneMenu>
<p:outputLabel value="确认者："/>
<p:inputText value="#{hazardousWasteController.applyPerson}"/>
<p:outputLabel value="单号："/>
- <p:inputText value="#{hazardousWasteController.tid}"/>
+ <p:inputText value="#{hazardousWasteController.tid}" style="width: 120px"/>
<p:outputLabel value="课题组"></p:outputLabel>
<p:selectOneMenu value="#{hazardousWasteController.project}" filter="true" filterMatchMode="startsWith">
<f:selectItem itemLabel="不选择课题组" />
@@ -58,6 +58,8 @@
<p:panel styleClass="center-body">
<p:panelGrid columns="5" styleClass="btn">
<p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="#{hazardousWasteController.export2Excel}" />
+ <p:commandButton value="取消" styleClass="del-btn" ajax="false" actionListener="#{hazardousWasteController.cancelOne}" />
+ <p:commandButton value="恢复" styleClass="edit-btn" ajax="false" actionListener="#{hazardousWasteController.recoverOne}" />
</p:panelGrid>
<p:dataTable id="hazardousWasteInfoMngDataTable"
styleClass="data-table"
@@ -65,6 +67,7 @@
paginatorAlwaysVisible="false"
paginatorPosition="bottom"
lazy="true" value="#{hazardousWasteController.dataModel}"
+ selection="#{hazardousWasteController.selectedOne}"
var="row"
rowKey="#{row.id}"
emptyMessage="无数据"
@@ -227,7 +230,11 @@
</p:panel>
</h:form>
</p:tab>
-
</p:tabView>
+ <style type="text/css">
+ .ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all{
+ min-width: 100px !important;
+ }
+ </style>
</ui:composition>
</html>
--
Gitblit v1.9.2