smartlab_promote.git

			@@ -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,70 +282,9 @@
			</p:panel>
			</h:form>
			<br/>
			<p:tabView dynamic="true" style="margin-left: 26px">
			<p:tab title="我的收藏">
			<h:form id="myFavor">
			<p:panelGrid style="margin: 5px">
			<div class="label-tip" style="margin-left: 5px; ">注意：已经收藏的试剂不会再出现在<span style="font-weight: 900;">试剂库</span>页面中</div>
			</p:panelGrid>
			<p:dataTable id="favorDataTable" styleClass="data-table" style="margin-left: 2px"
			resizableColumns="true" paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
			lazy="true" value="#{applyMngController.reagentFavorDataModel}" var="row" rowKey="#{row.id}"
			emptyMessage="请添加收藏" selectionMode="single"
			rows="50" pageLinks="5">

			<p:ajax event="rowDblselect" listener="#{applyMngController.onReagentRowSelect}" update=":applyMngNewForm,:applyDialog"></p:ajax>
			<p:column headerText="产品编号">
			<h:outputText value="#{row.productSn}"></h:outputText>
			</p:column>
			<p:column headerText="试剂名称">
			<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="管制品">
			<h:outputText value="#{baseMetaService.getBaseMetaValue(row.controlProducts)}"></h:outputText>
			</p:column>
			<!--<p:column headerText="试剂类型">-->
			<!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>-->
			<!--</p:column>-->
			<!--<p:column headerText="危险性质">-->
			<!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>-->
			<!--</p:column>-->
			<!-- <p:column headerText="供应商">
			<h:outputText value="#{row.supplierName}"></h:outputText>
			</p:column>-->
			<p:column headerText="规格型号">
			<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentFormat)}"></h:outputText>
			</p:column>
			<p:column headerText="包装">
			<h:outputText value="#{''.concat(row.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagentUnit))}"></h:outputText>
			</p:column>
			<p:column headerText="含税售价">
			<h:outputText value="#{row.price}"></h:outputText>
			</p:column>
			<p:column headerText="CAS号">
			<h:outputText value="#{row.cas}"></h:outputText>
			</p:column>
			<p:column headerText="危险性质">
			<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>
			</p:column>
			<p:column headerText="厂家">
			<h:outputText value="#{row.productHomeName}"></h:outputText>
			</p:column>
			<p:column headerText="试剂类型">
			<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">
			<f:setPropertyActionListener value="#{row}" target="#{applyMngController.selectReagent}" />
			</h:commandButton>

			</p:column>
			</p:dataTable>
			</h:form>

			</p:tab>
			<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>
			@@ -355,20 +294,14 @@
			<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"
			lazy="true" value="#{applyMngController.reagentDataModel}" var="row" rowKey="#{row.id}"
			emptyMessage="无数据" selectionMode="single"
			rows="50" pageLinks="5">
			rows="15" pageLinks="5">

			<p:ajax event="rowDblselect" listener="#{applyMngController.onReagentRowSelect}" update=":applyMngNewForm,:applyDialog"></p:ajax>
			<p:column headerText="产品编号">
			@@ -498,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">
			@@ -589,6 +522,70 @@
			</p:dataTable>
			</h:form>
			</p:tab>
			<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>-->
			<p:dataTable id="favorDataTable" styleClass="data-table" style="margin-left: 2px"
			resizableColumns="true" paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
			lazy="true" value="#{applyMngController.reagentFavorDataModel}" var="row" rowKey="#{row.id}"
			emptyMessage="请添加收藏" selectionMode="single"
			rows="50" pageLinks="5">

			<p:ajax event="rowDblselect" listener="#{applyMngController.onReagentRowSelect}" update=":applyMngNewForm,:applyDialog"></p:ajax>
			<p:column headerText="产品编号">
			<h:outputText value="#{row.productSn}"></h:outputText>
			</p:column>
			<p:column headerText="试剂名称">
			<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="管制品">
			<h:outputText value="#{baseMetaService.getBaseMetaValue(row.controlProducts)}"></h:outputText>
			</p:column>
			<!--<p:column headerText="试剂类型">-->
			<!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>-->
			<!--</p:column>-->
			<!--<p:column headerText="危险性质">-->
			<!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>-->
			<!--</p:column>-->
			<!-- <p:column headerText="供应商">
			<h:outputText value="#{row.supplierName}"></h:outputText>
			</p:column>-->
			<p:column headerText="规格型号">
			<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentFormat)}"></h:outputText>
			</p:column>
			<p:column headerText="包装">
			<h:outputText value="#{''.concat(row.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagentUnit))}"></h:outputText>
			</p:column>
			<p:column headerText="含税售价">
			<h:outputText value="#{row.price}"></h:outputText>
			</p:column>
			<p:column headerText="CAS号">
			<h:outputText value="#{row.cas}"></h:outputText>
			</p:column>
			<p:column headerText="危险性质">
			<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>
			</p:column>
			<p:column headerText="厂家">
			<h:outputText value="#{row.productHomeName}"></h:outputText>
			</p:column>
			<p:column headerText="试剂类型">
			<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>
			</p:column>
			<p:column headerText="操作" style="text-align: center;">
			<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}" />
			</p:commandButton>

			</p:column>
			</p:dataTable>
			</h:form>

			</p:tab>
			</p:tabView>
			</p:panel>
			</ui:composition>