From 1123d12eb51d23edcd4a39660ef8cd47802b931d Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 30 一月 2024 11:06:32 +0800
Subject: [PATCH] change config
---
src/main/webapp/apply_mng_new.xhtml | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/apply_mng_new.xhtml b/src/main/webapp/apply_mng_new.xhtml
index 3115715..ee2bafd 100644
--- a/src/main/webapp/apply_mng_new.xhtml
+++ b/src/main/webapp/apply_mng_new.xhtml
@@ -47,12 +47,12 @@
<p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>
- <p:column headerText="产品编号">
+ <p:column headerText="产品编号" style="white-space:normal;">
<h:outputText value="#{row.reagent!=null?row.reagent.productSn:''}"></h:outputText>
</p:column>
- <p:column headerText="试剂名称">
- <h:outputText value="#{row.reagent!=null?row.reagent.name:''}"></h:outputText>
+ <p:column headerText="试剂名称" style="white-space:normal;">
+ <h:outputText value="#{row.reagent!=null?row.reagent.name:''}" ></h:outputText>
</p:column>
<p:column headerText="管制品">
@@ -176,12 +176,12 @@
<p:row>
<p:column>
- <p:outputLabel value="课题名称："></p:outputLabel>
+ <p:outputLabel value="课题组："></p:outputLabel>
</p:column>
<p:column>
<p:selectOneMenu value="#{applyMngController.opeApply.objective}"
- required="true" requiredMessage="请选则课题名称" id="projectIdSel1">
+ required="true" requiredMessage="请选则课题组" id="projectIdSel1">
<f:selectItems value="#{applyMngController.sysProjectList}"
var="item" itemLabel="#{item.projectName}" itemValue="#{item.projectId}"></f:selectItems>
</p:selectOneMenu>
@@ -258,9 +258,9 @@
<f:ajax listener="#{applyMngController.changeCharge}" render="projectIdSel"/>
</p:selectOneMenu>
- <p:outputLabel value="课题名称："></p:outputLabel>
+ <p:outputLabel value="课题组："></p:outputLabel>
<p:selectOneMenu value="#{applyMngController.opeApply.objective}"
- required="true" requiredMessage="请选则课题名称" id="projectIdSel">
+ required="true" requiredMessage="请选择课题组" id="projectIdSel">
<f:selectItems value="#{applyMngController.sysProjectList}"
var="item" itemLabel="#{item.projectName}" itemValue="#{item.projectId}"></f:selectItems>
</p:selectOneMenu>
@@ -282,9 +282,9 @@
</p:panel>
</h:form>
<br/>
- <p:tabView dynamic="true" style="margin-left: 26px">
-
- <p:tab title="试剂库">
+ <p:tabView dynamic="true" style="margin-left: 26px" activeIndex="#{applyMngController.tabValue}">
+ <p:ajax event="tabChange" listener="#{applyMngController.onTabChange}"/>
+ <p:tab title="试剂库" id="reagent">
<h:form id="applyMngNewReagentForm">
<p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="9" style="margin-left: -18px">
<p:outputLabel value="试剂名称："></p:outputLabel>
@@ -294,14 +294,8 @@
<p:inputText value="#{applyMngController.applyNewCas}"></p:inputText>
<p:outputLabel value="产品编号："></p:outputLabel>
<p:inputText value="#{applyMngController.applyNewSn}"></p:inputText>
- <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
+ <p:commandLink styleClass="search reagentSearch" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
-
- <p:commandButton value="新增试剂" process="@this"
- actionListener="#{applyMngController.onReagentNewBtnClick}"
- oncomplete="PF('dialog').show();"
- update="@parent:@parent:@parent:dialog"
- styleClass="new-btn" style="position: absolute;display: none;right: 42px;top:62px"></p:commandButton>
<p:dataTable id="applyMngNewReagentDataTable" styleClass="data-table" style="margin-left: 2px"
resizableColumns="true" paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
@@ -313,7 +307,7 @@
<p:column headerText="产品编号">
<h:outputText value="#{row.productSn}"></h:outputText>
</p:column>
- <p:column headerText="试剂名称">
+ <p:column headerText="试剂名称" style="white-space:normal;">
<h:outputText value="#{row.name}"></h:outputText>
<h:outputText value="收藏" readonly="true" rendered="#{row.favor!=null}" styleClass="favor"></h:outputText>
</p:column>
@@ -437,7 +431,7 @@
</h:form>
</p:dialog>
</p:tab>
- <p:tab title="申请履历">`
+ <p:tab title="申请履历" id="applyHistory">
<h:form id="applyMngNewHistoryForm">
<p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="5" style="margin-left: -18px">
@@ -466,11 +460,11 @@
<p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>
<p:ajax event="rowDblselect" listener="#{applyMngController.onApplyHistoryRowSelect}" update=":applyMngNewForm,:applyDialog"></p:ajax>
- <p:column headerText="申购编号" width="120">
+ <p:column headerText="申购编号" width="120" style="white-space:normal;">
<h:outputText value="#{row.applyCode}"></h:outputText>
</p:column>
- <p:column headerText="申购产品">
+ <p:column headerText="申购产品" style="white-space:normal;">
<h:outputText value="#{row.reagent!=null?row.reagent.name:''}"></h:outputText>
</p:column>
@@ -528,8 +522,8 @@
</p:dataTable>
</h:form>
</p:tab>
- <p:tab title="我的收藏">
- <h:form id="myFavor">
+ <p:tab title="我的收藏" id="favor">
+ <h:form id="myFavor" styleClass="myFavor">
<!-- <p:panelGrid style="margin: 5px">-->
<!-- <div class="label-tip" style="margin-left: 5px; ">注意：已经收藏的试剂不会再出现在<span style="font-weight: 900;">*试剂库*</span>页面中</div>-->
<!-- </p:panelGrid>-->
@@ -540,11 +534,11 @@
rows="50" pageLinks="5">
<p:ajax event="rowDblselect" listener="#{applyMngController.onReagentRowSelect}" update=":applyMngNewForm,:applyDialog"></p:ajax>
- <p:column headerText="产品编号">
+ <p:column headerText="产品编号" style="white-space:normal;">
<h:outputText value="#{row.productSn}"></h:outputText>
</p:column>
- <p:column headerText="试剂名称">
- <h:outputText value="#{row.name}"></h:outputText>
+ <p:column headerText="试剂名称" style="white-space:normal;">
+ <h:outputText value="#{row.name}" ></h:outputText>
<h:outputText value="收藏" readonly="true" rendered="#{row.favor!=null}" styleClass="favor"></h:outputText>
</p:column>
<p:column headerText="管制品">
@@ -581,9 +575,11 @@
<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>
</p:column>
<p:column headerText="操作" style="text-align: center;">
- <h:commandButton styleClass="favor-btn-common #{row.favor == null?'favor-btn':'not-favor-btn'}" value="#{row.favor == null?'加入收藏':'取消收藏'}" update="@this">
+ <p:commandButton styleClass="favor-btn-common #{row.favor == null?'favor-btn':'not-favor-btn'}"
+ style="background-image:unset;background-color: #1b9aee;color:#ffffff;border: unset" value="#{row.favor == null?'加入收藏':'取消收藏'}"
+ update="@(.myFavor)">
<f:setPropertyActionListener value="#{row}" target="#{applyMngController.selectReagent}" />
- </h:commandButton>
+ </p:commandButton>
</p:column>
</p:dataTable>
--
Gitblit v1.9.2