From 4f4898cc6e137ee5b47542cf8b1c73f3da3a1ee5 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 08 一月 2021 14:57:32 +0800
Subject: [PATCH] 点击优化和Bug修改

---
 src/main/webapp/apply_mng_new.xhtml |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/apply_mng_new.xhtml b/src/main/webapp/apply_mng_new.xhtml
index 463b8c5..063b66f 100644
--- a/src/main/webapp/apply_mng_new.xhtml
+++ b/src/main/webapp/apply_mng_new.xhtml
@@ -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,7 +294,7 @@
                         <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"
@@ -437,7 +437,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">
@@ -528,8 +528,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>-->
@@ -581,9 +581,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