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/apply_mng.xhtml | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/apply_mng.xhtml b/src/main/webapp/apply_mng.xhtml
index 813cfd8..7b81d3e 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,13 +37,34 @@
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>
<p:panel styleClass="center-body">
- <p:panelGrid columns="5" styleClass="btn">
+ <p:panelGrid columns="7" styleClass="btn">
<p:commandButton value="申购" styleClass="new-btn"
process="@this"
actionListener="#{applyMngController.onNewBtnClick}"
@@ -69,7 +87,21 @@
</p:commandButton>
<p:commandButton update=":centerRootPanel" actionListener="#{applyMngController.onExportFileBtnClickNew}"
ajax="false" value="导出" styleClass="new-btn" />
+
+<!-- <p:commandButton onclick="importApply()" value="导入" styleClass="import-btn" />-->
+<!-- <a href="resources/template/申购导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>-->
</p:panelGrid>
+ <script type="text/javascript">
+ function importApply(){
+ $("#applyMngForm\\:importApplyBtn_input").click();
+ }
+ </script>
+ <div style="display: none" id='importDv'>
+ <p:fileUpload fileUploadListener="#{applyMngController.uploadApply}"
+ dragDropSupport="false" id="importApplyBtn" label="导入"
+ update="@form" auto="true" sizeLimit="5000000"
+ mode="advanced"/>
+ </div>
<p:dataTable id="applyMngDataTable" styleClass="data-table" resizableColumns="true"
paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
@@ -93,15 +125,15 @@
</p:column>
<p:column headerText="管制品">
- <h:outputText value="#{row.reagent!=null?baseMetaService.getBaseMetaValue(row.reagent.controlProducts):''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?row.reagent.controlProducts:''}"></h:outputText>
</p:column>
<p:column headerText="规格型号">
- <h:outputText value="#{row.reagent!=null?baseMetaService.getBaseMetaValue(row.reagent.reagentFormat):''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?row.reagent.reagentFormat:''}"></h:outputText>
</p:column>
<p:column headerText="包装">
- <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)):''}"></h:outputText>
</p:column>
<p:column headerText="含税售价" width="50px;">
@@ -113,15 +145,14 @@
</p:column>
<p:column headerText="危险性质" width="79px;">
- <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentCharacter)}" style="white-space: normal;font-size: 13px;"></h:outputText>
+ <h:outputText value="#{row.reagent.reagentCharacter}" style="white-space: normal;font-size: 13px;"></h:outputText>
</p:column>
-
<p:column headerText="厂家">
- <h:outputText value="#{row.reagent!=null?row.reagent.productHomeName:''}"></h:outputText>
+ <h:outputText value="#{row.reagent!=null?row.reagent.productHome:''}"></h:outputText>
</p:column>
<p:column headerText="试剂类型" width="38px;" style="text-align: center;white-space: normal">
- <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentType)}"></h:outputText>
+ <h:outputText value="#{row.reagent.reagentType}"></h:outputText>
</p:column>
<p:column headerText="申购数量" width="38px;" style="white-space: normal">
--
Gitblit v1.9.2