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/warehouse_reagent_use_person.xhtml | 269 +++++++++++++++++++++++++++++------------------------
1 files changed, 145 insertions(+), 124 deletions(-)
diff --git a/src/main/webapp/warehouse_reagent_use_person.xhtml b/src/main/webapp/warehouse_reagent_use_person.xhtml
index ddd84f7..915507d 100644
--- a/src/main/webapp/warehouse_reagent_use_person.xhtml
+++ b/src/main/webapp/warehouse_reagent_use_person.xhtml
@@ -29,12 +29,7 @@
<h:outputText value="#{item.name}" />
</p:column>
</p:autoComplete>
- <!-- <p:outputLabel value="课题名称："></p:outputLabel>
- <p:selectOneMenu value="#{warehouseStockMngController.projectNum}"
- required="true" requiredMessage="请选择课题名称">
- <f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_PROJECT_NUM)}"
- var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>-->
+
<p:outputLabel value="实验室：" style="margin-left: 20px"></p:outputLabel>
<p:selectOneMenu value="#{warehouseStockMngController.laboratoryId}"
id="experments">
@@ -92,6 +87,10 @@
<h:outputText value="#{row.articleNumber}"></h:outputText>
</p:column>
+ <p:column headerText="申领人">
+ <h:outputText value="#{row.applyUserId}"></h:outputText>
+ </p:column>
+
<p:column headerText="申请数量">
<h:outputText value="#{row.num}"></h:outputText>
</p:column>
@@ -114,16 +113,16 @@
</p:panel>
</h:form>
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
- <div id="printTarget">
- <div style=" margin: 10mm 10mm 0mm 2mm;">
+ <div id="printTarget" style="margin-right: -51px;">
+ <div style="margin: 25mm 17mm 0mm 15mm; ">
<h:form id="printDialog" style="width: 1100px">
- <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
- <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
<div>
- <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-right: 17px;">
- <div style="width: 100px;">单据编号:</div>
- <div>
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
+ <div style="width: 98px;">单据编号：</div>
+ <div style="width: 183px;">
<!-- <input style="border: 0;" value="#{warehouseStockMngController.printTable['receiptNumber']}"/>-->
<p:inputText value="#{warehouseStockMngController.receiptNumber}" valueChangeListener="#{warehouseStockMngController.receiptNumberChange}">
<p:ajax event="valueChange" listener="#{warehouseStockMngController.receiptNumberChange()}" />
@@ -134,32 +133,42 @@
<div style="margin: 10px 0;">
<div style="display: inline-flex;">
- <div style="width: 100px;margin-left: 10px;">部门:</div>
+ <div style="width: 100px;margin-left: 10px;">部门：</div>
<div style="width: 300px;">#{warehouseStockMngController.printTable['department']}</div>
</div>
<div style="display: inline-flex;">
- <div style="width: 100px;">申购人:</div>
+ <div style="width: 100px;">申购人：</div>
<div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['applyPerson']}</div>
</div>
<div style="display: inline-flex;float: right;">
- <div style="width: 100px;">日期:</div>
+ <div style="width: 100px;">日期：</div>
<div style="width: 200px;padding-top: 1px;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></div>
+ </div>
+ </div>
+
+ <div style="margin-bottom: 10px;">
+ <div style="display: inline-flex;">
+ <div style="width: 100px;margin-left: 10px;">课题组：</div>
+ <div style="width: 300px;">#{warehouseStockMngController.printTable['project']}</div>
+ </div>
+ <div style="display: inline-flex;">
+ <div style="width: 100px;">使用地点：</div>
+ <div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['lab']}</div>
+ </div>
+ <div style="display: inline-flex;float: right;">
+ <div style="width: 100px;">联系方式：</div>
+ <div style="width: 200px;">
+ <input style="border: 0;" value="#{warehouseStockMngController.printTable['phone']}"/></div>
</div>
</div>
<div style="margin-bottom: 20px;">
<div style="display: inline-flex;">
- <div style="width: 100px;margin-left: 10px;">课题组</div>
- <div style="width: 300px;">#{warehouseStockMngController.printTable['project']}</div>
- </div>
- <div style="display: inline-flex;">
- <div style="width: 100px;">使用地点:</div>
- <div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['lab']}</div>
- </div>
- <div style="display: inline-flex;float: right;">
- <div style="width: 100px;">联系方式:</div>
- <div style="width: 200px;">
- <input style="border: 0;" value="#{warehouseStockMngController.printTable['phone']}"/></div>
+ <div style="width: 100px;margin-left: 10px;">备注</div>
+ <div style="">
+ <p:inputText value="#{warehouseStockMngController.note}" style="width: 950px;">
+ <p:ajax event="valueChange" />
+ </p:inputText></div>
</div>
</div>
@@ -184,7 +193,7 @@
</p:column>
<p:column headerText="包装" width="90px;" style="text-align: center;">
- <h:outputText value="#{row.mainMetering==null?'':row.mainMetering}" />
+ <h:outputText value="#{row.mainMetering==null?'':row.mainMetering.replace('null','')}" />
</p:column>
<p:column headerText="数量" width="90px;" style="text-align: center;">
@@ -196,27 +205,37 @@
</p:column>
</p:dataTable>
- <div style="margin-top: 20px;margin-right: 94px;">
- <div style="display: flex;flex-direction: row;justify-content: flex-end;">
- <div style="width: 100px">签收人:</div>
- <div style="width: 100px"></div>
+ <div style="display: flex;flex-direction: row;justify-content: space-between;margin-top:20px; ">
+ <div style="margin-left: 94px;">
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;">
+ <div style="width: 100px">出库人：</div>
+ <div style="width: 100px"></div>
+ </div>
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px; ">
+ <div style="width: 100px">日期：</div>
+ <div style="width: 100px"></div>
+ </div>
+
+ </div>
+ <div style="margin-right: 94px;">
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;">
+ <div style="width: 100px">签收人：</div>
+ <div style="width: 100px"></div>
+ </div>
+ <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px;">
+ <div style="width: 100px">日期：</div>
+ <div style="width: 100px"></div>
+ </div>
+
</div>
</div>
-
- <div style="margin: 10px 94px 10px 0;">
- <div style="display: flex;flex-direction: row;justify-content: flex-end;">
- <div style="width: 100px">日期:</div>
- <div style="width: 100px"></div>
- </div>
- </div>
-
<p:panel styleClass="btn no-print">
<p:commandButton value="关闭"
process="@this"
styleClass="yes-btn"
- actionListener="#{warehouseStockMngController.onCancelBtnClick}"
+ actionListener="#{warehouseStockMngController.closeDialog}"
style="position: relative;left: 20px;"
update=":centerRootPanel"
oncomplete="PF('printDialog').hide()">
@@ -245,103 +264,105 @@
</div>
</p:dialog>
<p:dialog modal="true" header="领用详情" appendTo="@(body)" id="reagentCodeDialogForPerson"
- widgetVar="reagentCodeDialogForPerson" resizable="false" width="930" class="ui-dialog">
+ widgetVar="reagentCodeDialogForPerson" resizable="false" width="1000" class="ui-dialog">
<p:tabView dynamic="true" style="margin-left: 26px">
- <p:tab title="补贴条码" id="applyInOrder">
- <h:form id="reagentCodeDialogForm2">
- <p:panelGrid styleClass="center-header content2" columns="6">
- <p:column style="width: 60px !important;"><p:outputLabel value="仓库名："/></p:column>
- <p:selectOneMenu value="#{warehouseStockMngController.opeWarehouseReserve.warehouseId}" >
- <p:ajax event="change" process="@this" listener="#{warehouseStockMngController.selectChangeReserve(warehouseStockMngController.opeWarehouseReserve.warehouseId)}"
- update="reserve"/>
- <f:selectItems value="#{warehouseStockMngController.warehouseReserveList}"
- var="item"
- itemValue="#{item.warehouseId}"
- itemLabel="#{item.warehouseName}"/>
- </p:selectOneMenu>
+<!-- <p:tab title="补贴条码" id="applyInOrder">-->
+<!-- <h:form id="reagentCodeDialogForm2">-->
+<!-- <p:panelGrid styleClass="center-header content2" columns="6">-->
+<!-- <p:column style="width: 60px !important;"><p:outputLabel value="仓库名："/></p:column>-->
+<!-- <p:selectOneMenu value="#{warehouseStockMngController.opeWarehouseReserve.warehouseId}" >-->
+<!-- <p:ajax event="change" process="@this" listener="#{warehouseStockMngController.selectChangeReserve(warehouseStockMngController.opeWarehouseReserve.warehouseId)}"-->
+<!-- update="reserve"/>-->
+<!-- <f:selectItems value="#{warehouseStockMngController.warehouseReserveList}"-->
+<!-- var="item"-->
+<!-- itemValue="#{item.warehouseId}"-->
+<!-- itemLabel="#{item.warehouseName}"/>-->
+<!-- </p:selectOneMenu>-->
- <p:column>
- <p:outputLabel id="reserve" value="可供库存：" style="width: 100px;">
- <span style="color: #1c427b;font-weight: bolder;font-size: 20px">#{warehouseStockMngController.opeWarehouseReserve.reserve}</span>
- </p:outputLabel>
- </p:column>
+<!-- <p:column>-->
+<!-- <p:outputLabel id="reserve" value="可供库存：" style="width: 100px;">-->
+<!-- <span style="color: #1c427b;font-weight: bolder;font-size: 20px">#{warehouseStockMngController.opeWarehouseReserve.reserve}</span>-->
+<!-- </p:outputLabel>-->
+<!-- </p:column>-->
- <p:outputLabel value="领用数量：" style="width: 80px;"/>
- <p:inputNumber value="#{warehouseStockMngController.useNum}"
- minValue="0" decimalPlaces="0"
- required="true" requiredMessage="请输入领用数量" id="useNum"/>
- <p:column>
- <p:commandButton value="添加"
- process="@this,useNum"
- styleClass="yes-btn"
- actionListener="#{warehouseStockMngController.add2()}"
- update="@(.reagentCode),endReagentCode"
- style="position: relative;left: 20px;width: 58px;height: 34px;">
- </p:commandButton>
- </p:column>
- </p:panelGrid>
- <p:separator style="margin: 15px"/>
- <p:dataTable id="reagentCode" styleClass="reagentCode"
- paginatorPosition="bottom"
- lazy="true"
- value="#{warehouseStockMngController.getDataTmp()}"
- var="row"
- rowKey="#{row.id}"
- scrollable="false"
- rows="5" pageLinks="5"
- emptyMessage="无领用数据">
+<!-- <p:outputLabel value="领用数量：" style="width: 80px;"/>-->
+<!-- <p:inputNumber value="#{warehouseStockMngController.useNum}"-->
+<!-- minValue="0" decimalPlaces="0"-->
+<!-- required="true" requiredMessage="请输入领用数量" id="useNum"/>-->
+<!-- <p:column>-->
+<!-- <p:panel styleClass="btn" style="text-align: right">-->
+<!-- <p:commandButton value="添加"-->
+<!-- process="@this,useNum"-->
+<!-- styleClass="yes-btn"-->
+<!-- actionListener="#{warehouseStockMngController.add2()}"-->
+<!-- update="@(.reagentCode),endReagentCode"-->
+<!-- style="position: relative;left: -8px;width: 62px;height: 34px;font-size: 12px;background-color: #ee7135">-->
+<!-- </p:commandButton>-->
+<!-- </p:panel>-->
+<!-- </p:column>-->
+<!-- </p:panelGrid>-->
+<!-- <p:separator style="margin: 15px"/>-->
+<!-- <p:dataTable id="reagentCode" styleClass="reagentCode"-->
+<!-- paginatorPosition="bottom"-->
+<!-- lazy="true"-->
+<!-- value="#{warehouseStockMngController.getDataTmp()}"-->
+<!-- var="row"-->
+<!-- rowKey="#{row.id}"-->
+<!-- scrollable="false"-->
+<!-- rows="5" pageLinks="5"-->
+<!-- emptyMessage="无领用数据">-->
- <p:column headerText="操作" style="text-align: center;">
- <p:commandButton style="background: #e68280; border: 1px solid #e68280;color: white;" styleClass="store-btn"
- value="取消"
- actionListener="#{warehouseStockMngController.remove2(row)}"
- process="@this"
- update="@(.reagentCode),@(.endReagentCode)">
- </p:commandButton>
- </p:column>
+<!-- <p:column headerText="操作" style="text-align: center;">-->
+<!-- <p:commandButton style="background: #e68280; border: 1px solid #e68280;color: white;" styleClass="store-btn"-->
+<!-- value="取消"-->
+<!-- actionListener="#{warehouseStockMngController.remove2(row)}"-->
+<!-- process="@this"-->
+<!-- update="@(.reagentCode),@(.endReagentCode)">-->
+<!-- </p:commandButton>-->
+<!-- </p:column>-->
- <p:column headerText="仓库名" style="text-align: center;">
- <h:outputText value="#{row.warehouseName}" />
- </p:column>
- <p:column headerText="试剂名称" style="text-align: center;">
- <h:outputText value="#{sysReagentService.getSysReagent(row.reagentId).name}" />
- </p:column>
+<!-- <p:column headerText="仓库名" style="text-align: center;">-->
+<!-- <h:outputText value="#{row.warehouseName}" />-->
+<!-- </p:column>-->
+<!-- <p:column headerText="试剂名称" style="text-align: center;">-->
+<!-- <h:outputText value="#{sysReagentService.getSysReagent(row.reagentId).name}" />-->
+<!-- </p:column>-->
- <p:column headerText="库存" style="text-align: center;">
- <h:outputText value="#{row.reserve}" />
- </p:column>
+<!-- <p:column headerText="库存" style="text-align: center;">-->
+<!-- <h:outputText value="#{row.reserve}" />-->
+<!-- </p:column>-->
- <p:column headerText="领用数量" style="text-align: center;">
- <h:outputText value="#{row.useNum}" />
- </p:column>
- </p:dataTable>
+<!-- <p:column headerText="领用数量" style="text-align: center;">-->
+<!-- <h:outputText value="#{row.useNum}" />-->
+<!-- </p:column>-->
+<!-- </p:dataTable>-->
- <p:panelGrid styleClass="center-header content2" columns="4" id="code" style="margin-top:20px;">
+<!-- <p:panelGrid styleClass="center-header content2" columns="4" id="code" style="margin-top:20px;">-->
- <p:outputLabel value="条形码开始"/>
- <p:inputText id="startReagentCode" styleClass="startReagentCode" value="#{warehouseStockMngController.startReagentCodeForPerson}" maxlength="32" required="true" requiredMessage="请输入条形码开始">
- <p:ajax event="change" listener="#{warehouseStockMngController.btCodeChange()}" update="endReagentCode"/>
- </p:inputText>
+<!-- <p:outputLabel value="条形码开始"/>-->
+<!-- <p:inputText id="startReagentCode" styleClass="startReagentCode" value="#{warehouseStockMngController.startReagentCodeForPerson}" maxlength="32" required="true" requiredMessage="请输入条形码开始">-->
+<!-- <p:ajax event="change" listener="#{warehouseStockMngController.btCodeChange()}" update="endReagentCode"/>-->
+<!-- </p:inputText>-->
- <p:outputLabel value="条形码结束"/>
- <p:inputText id="endReagentCode" styleClass="endReagentCode" value="#{warehouseStockMngController.endReagentCodeForPerson}" maxlength="32" required="true" requiredMessage="请输入条形码结束"/>
- </p:panelGrid>
+<!-- <p:outputLabel value="条形码结束"/>-->
+<!-- <p:inputText id="endReagentCode" styleClass="endReagentCode" value="#{warehouseStockMngController.endReagentCodeForPerson}" maxlength="32" required="true" requiredMessage="请输入条形码结束"/>-->
+<!-- </p:panelGrid>-->
- <!--</p:panel>-->
- <p:panel styleClass="btn" style="text-align: right">
- <p:commandButton value="确定"
- actionListener="#{warehouseStockMngController.onYesBtnClickForPerson2}"
- process="@form"
- update=":warehouseReagentUseForm:warehouseReagentUseDataTableForPerson"
- styleClass="yes-btn">
- </p:commandButton>
- </p:panel>
- </h:form>
- </p:tab>
+<!-- <!–</p:panel>–>-->
+<!-- <p:panel styleClass="btn" style="text-align: right">-->
+<!-- <p:commandButton value="确定"-->
+<!-- actionListener="#{warehouseStockMngController.onYesBtnClickForPerson2}"-->
+<!-- process="@form"-->
+<!-- update=":warehouseReagentUseForm:warehouseReagentUseDataTableForPerson"-->
+<!-- styleClass="yes-btn">-->
+<!-- </p:commandButton>-->
+<!-- </p:panel>-->
+<!-- </h:form>-->
+<!-- </p:tab>-->
<p:tab title="库中领取" id="applyInWarehouse">
<h:form id="reagentCodeDialogForm">
<p:panel styleClass="center-header content2">
@@ -362,7 +383,7 @@
layout="grid" columns="4">
<f:selectItems
value="#{warehouseStockMngController.reagentStatusSelectListForPerson}" var="item"
- itemLabel="#{item.reagentCode}" itemValue="#{item.id}" />
+ itemLabel="#{item.reagentCode}" itemValue="#{item.reagentCode}" />
</p:selectManyCheckbox>
</p:panel>
--
Gitblit v1.9.2