From 5d06180456819a8d3c5a092597c1f466562f1cd4 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 22 九月 2021 13:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/apply_mng.xhtml | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/apply_mng.xhtml b/src/main/webapp/apply_mng.xhtml
index 9dd4ec6..dbd9554 100644
--- a/src/main/webapp/apply_mng.xhtml
+++ b/src/main/webapp/apply_mng.xhtml
@@ -15,8 +15,7 @@
<p:panel styleClass="center-header">
<p:outputLabel styleClass="title" value="申购管理"></p:outputLabel>
- <p:panelGrid styleClass="filter" columns="13">
- <p:row>
+ <p:panelGrid styleClass="filter" columns="16">
<p:outputLabel value="申购产品："></p:outputLabel>
<p:inputText value="#{applyMngController.reagentName}"></p:inputText>
@@ -31,8 +30,6 @@
<p:calendar value="#{applyMngController.endDeadline}" converter="timestampConvert"
pattern="yyyy-MM-dd" locale="zh_CN"></p:calendar>
<p:outputLabel value="状态："></p:outputLabel>
- </p:row>
- <p:row>
<p:selectOneMenu value="#{applyMngController.status}">
<f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
@@ -40,8 +37,29 @@
itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems>
</p:selectOneMenu>
+ <p:outputLabel value="管制品："></p:outputLabel>
+ <p:selectOneMenu value="#{applyMngController.controlProduct}">
+ <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
+ <f:selectItem itemLabel="易制毒" itemValue="易制毒" ></f:selectItem>
+ <f:selectItem itemLabel="易制爆" itemValue="易制爆" ></f:selectItem>
+ <f:selectItem itemLabel="剧毒" itemValue="剧毒" ></f:selectItem>
+ </p:selectOneMenu>
+
+ <style type="text/css">
+ .ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all{
+ min-width: 30px !important;
+ }
+ #centerRootPanel .center-header .filter .ui-selectonemenu {
+ width: 73px !important;
+ }
+ #centerRootPanel .center-header .filter input {
+ height: 30px;
+ background-color: #eaeef7!important;
+ width: 120px !important;
+ }
+ </style>
+
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
- </p:row>
</p:panelGrid>
</p:panel>
--
Gitblit v1.9.2