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/reagent_user_flow_info.xhtml | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/reagent_user_flow_info.xhtml b/src/main/webapp/reagent_user_flow_info.xhtml
index a868bfc..fc4907a 100644
--- a/src/main/webapp/reagent_user_flow_info.xhtml
+++ b/src/main/webapp/reagent_user_flow_info.xhtml
@@ -15,7 +15,15 @@
<p:outputLabel styleClass="title" value="试剂流向追踪"></p:outputLabel>
<p:panel styleClass="center-header">
- <p:panelGrid styleClass="filter" columns="13">
+ <p:panelGrid styleClass="filter" columns="16">
+ <style type="text/css">
+ .ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all{
+ min-width: 60px !important;
+ }
+ .ui-selectonemenu-items.ui-selectonemenu-list.ui-widget-content.ui-widget.ui-corner-all.ui-helper-reset{
+ width: 77px !important;
+ }
+ </style>
<p:outputLabel value="开始时间："></p:outputLabel>
<p:calendar value="#{opeUseFlowInfoController.startDate}"></p:calendar>
@@ -33,6 +41,15 @@
<p:outputLabel value="场所名："></p:outputLabel>
<p:inputText value="#{opeUseFlowInfoController.houseName}"></p:inputText>
+
+ <p:outputLabel value="操作状态："></p:outputLabel>
+ <p:selectOneMenu value="#{opeUseFlowInfoController.operatestate}" style="width: 60px;">
+ <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
+ <f:selectItems value="#{opeUseFlowInfoController.getOperatestateList()}"
+ var="item" itemLabel="#{item.value}" itemValue="#{item.key}"></f:selectItems>
+ </p:selectOneMenu>
+
+
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
</p:panel>
@@ -40,8 +57,10 @@
<p:panel styleClass="center-body">
- <p:panelGrid columns="1" styleClass="btn">
+ <p:panelGrid columns="2" styleClass="btn">
<p:commandButton value="报废" styleClass="del-btn" ajax="false" actionListener="#{opeUseFlowInfoController.scrapReagent}" />
+ <p:commandButton value="导出" styleClass="new-btn" ajax="false" id="exportButton" widgetVar="exportButton"
+ actionListener="#{opeUseFlowInfoController.export2Excel}" />
</p:panelGrid>
<p:dataTable id="reagentUseFlowInfoDataTable" styleClass="data-table"
paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
@@ -185,19 +204,31 @@
</p:column>
</p:dataTable>
- <div style="margin-top: 20px;">
- <div style="display: flex;flex-direction: row;justify-content: flex-end;">
- <div style="width: 100px">签收人：</div>
- <div style="width: 300px"></div>
+ <div style="display: flex;flex-direction: row;justify-content: space-between;margin-top:20px; ">
+ <div style="margin-left: 94px;">
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;">
+ <div style="width: 100px">出库人：</div>
+ <div style="width: 100px"></div>
+ </div>
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px; ">
+ <div style="width: 100px">日期：</div>
+ <div style="width: 100px"></div>
+ </div>
+
+ </div>
+ <div style="margin-right: 94px;">
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;">
+ <div style="width: 100px">签收人：</div>
+ <div style="width: 100px"></div>
+ </div>
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px;">
+ <div style="width: 100px">日期：</div>
+ <div style="width: 100px"></div>
+ </div>
+
</div>
</div>
- <div style="margin: 10px 0">
- <div style="display: flex;flex-direction: row;justify-content: flex-end;">
- <div style="width: 100px">日期：</div>
- <div style="width: 300px"></div>
- </div>
- </div>
<p:panel styleClass="btn no-print">
<div class="div-btn cancel" id="cancel">关闭</div>
--
Gitblit v1.9.2