smartlab_promote.git

			@@ -153,7 +153,7 @@

			<select id="getOpeApplyList" parameterType="java.util.Map" resultMap="OpeApply">
			select oa.*,sys.name as secondUserName,
			sr.name as reagentName, sr.cas as reagentCas, sr.reagent_type as reagentType, sr.reagent_character as reagentCharacter, sr.supplier_id as reagentSupplierId,
			sr.name as reagentName,sr.price as reagentPrice ,sr.cas as reagentCas, sr.reagent_type as reagentType, sr.reagent_character as reagentCharacter, sr.supplier_id as reagentSupplierId,
			sr.reagent_format as reagentFormat, sr.main_metering as reagentMainMetering, sr.reagent_unit as reagentUnit, sr.per_box as reagentPerBox,
			sr.memo as reagentMemo, sr.valid_flag as reagentValidFlag, sr.create_time as reagentCreateTime, sr.update_time as reagentUpdateTime, sr.product_sn as reagentProductSn,
			sr.dangerous_flag as reagentDangerousFlag,sr.control_products as controlProducts,sr.product_home as productHome,

			@@ -68,7 +68,7 @@
			</p:column>

			<p:column headerText="含税售价">
			<h:outputText value="#{row.reagent!=null?row.reagent.price:''}"></h:outputText>
			<h:outputText value="#{row.reagent.price}"></h:outputText>
			</p:column>

			<p:column headerText="CAS号">
			@@ -438,7 +438,7 @@
			</h:form>
			</p:dialog>
			</p:tab>
			<p:tab title="申请履历">
			<p:tab title="申请履历">`
			<h:form id="applyMngNewHistoryForm">

			<p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="5" style="margin-left: -18px">
			@@ -491,10 +491,14 @@
			<h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText>
			</p:column>

			<p:column headerText="含税售价">
			<p:column headerText="试剂单价">
			<h:outputText value="#{row.reagent!=null?row.reagent.price:''}"></h:outputText>
			</p:column>

			<p:column headerText="含税售价">
			<h:outputText value="#{row.applyPrice}"></h:outputText>
			</p:column>

			<p:column headerText="每箱数量">
			<h:outputText value="#{row.reagent!=null?row.reagent.perBox:''}"></h:outputText>
			</p:column>

	src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/apply_mng_new.xhtml	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史