From df47c9300bfe6c641c88707aa5b54591ab4c004c Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 15:18:58 +0800
Subject: [PATCH] 订单领取：过期处理(确认和过期 状态处理),增加状态过期（需要将数据库字段加长） 实验室选中问题 仓库领取的仓库不存在问题
---
src/main/webapp/warehouse_reagent_use.xhtml | 110 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 37 deletions(-)
diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index 0767d75..790913e 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -24,7 +24,7 @@
var="item"
dropdown="true"
styleClass="apply-user-autocomplete"
- itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : null}"
+ itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : ' '}"
itemValue="#{item.id}" forceSelection="true">
<p:ajax event="itemSelect" listener="#{warehouseStockMngController.resetLaboratory()}" process="@this" update="@this,experments,stacks" />
<p:column>
@@ -43,7 +43,7 @@
id="experments">
<f:selectItems value="#{warehouseStockMngController.laboratory}"
var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
- <f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" update="stacks"/>
+ <f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" render="stacks"/>
</p:selectOneMenu>
<p:outputLabel value="实验室试剂柜："></p:outputLabel>
<p:selectOneMenu value="#{warehouseStockMngController.laboratoryContainerId}" id="stacks"
@@ -102,7 +102,7 @@
}
}
-
+
function allSelected() {
selectFunc(num);
num++;
@@ -124,11 +124,11 @@
.children("span").removeClass("ui-icon-blank").addClass("ui-icon-check")
}
}
-
+
function changeCount() {
$("#num").val($("#reagentCodeDialog td div[class*=ui-state-active]").size());
}
-
+
function change(element) {
var selected = element.checked;
var num = 0;
@@ -204,42 +204,54 @@
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
- <div id="printTarget">
- <div style=" margin: 10mm 10mm 0mm 2mm;">
- <h:form id="printDialog">
+ <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>
- <div>
- <div style="display: flex;flex-direction: row;justify-content: flex-end;">
- <div style="width: 100px;">单据编号:</div>
- <div style="width: 300px;"><input style="border: 0;" value=""/></div>
+ <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;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()}" />
+ </p:inputText>
</div>
</div>
+ </div>
<div style="margin: 10px 0;">
<div style="display: inline-flex;">
<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: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['applyPerson']}</div>
+ </div>
<div style="display: inline-flex;float: right;">
<div style="width: 100px;">日期:</div>
- <div style="width: 300px;padding-top: 1px;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></div>
+ <div style="width: 200px;padding-top: 1px;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></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['applyPerson']}</div>
+ <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: 300px;">
+ <div style="width: 200px;">
<input style="border: 0;" value="#{warehouseStockMngController.printTable['phone']}"/></div>
</div>
</div>
-
@@ -261,7 +273,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;">
@@ -288,8 +300,32 @@
</div>
<p:panel styleClass="btn no-print">
- <div class="div-btn cancel" id="cancel">关闭</div>
- <div class="div-btn print" id="print">打印</div>
+ <p:commandButton value="关闭"
+ process="@this"
+ styleClass="yes-btn"
+ actionListener="#{warehouseStockMngController.closeDialog2}"
+ style="position: relative;left: 20px;"
+ update=":centerRootPanel"
+ oncomplete="PF('printDialog').hide()">
+ </p:commandButton>
+ <div style="display: none" id="indirectPrint"></div>
+ <p:commandButton value="打印"
+ styleClass="yes-btn"
+ actionListener="#{warehouseStockMngController.associatedFlowReceiptNumber2()}"
+ style="position: relative;left: 20px;"
+ >
+ </p:commandButton>
+
+ <script type="text/javascript" src="resources/js/print.js"/>
+ <script type="text/javascript">
+ $(function () {
+ $("#indirectPrint").on("click", function () {
+ jQuery.print('#printTarget')
+ })
+ })
+
+
+ </script>
</p:panel>
</h:form>
</div>
@@ -308,24 +344,24 @@
<p:column><p:inputNumber value="#{warehouseStockMngController.useNum}"
minValue="0" decimalPlaces="0"
required="true" requiredMessage="请输入领用数量" id="useNum"/></p:column>
- <p:column><p:outputLabel value="条码情况" /></p:column>
- <p:column><p:selectOneMenu id="advanced" panelStyle="width:180px"
- effect="fade" style="width:160px" filter="true" filterMatchMode="startsWith">
- <f:selectItems value="#{warehouseStockMngController.showCodes}" var="code" itemValue="#{code}" />
+<!-- <p:column><p:outputLabel value="条码情况" /></p:column>-->
+<!-- <p:column><p:selectOneMenu id="advanced" panelStyle="width:180px"-->
+<!-- effect="fade" style="width:160px" filter="true" filterMatchMode="startsWith">-->
+<!-- <f:selectItems value="#{warehouseStockMngController.showCodes}" var="code" itemValue="#{code}" />-->
- <p:column>
- <f:facet name="header">
- <h:outputText value="Name"/>
- </f:facet>
- </p:column>
+<!-- <p:column>-->
+<!-- <f:facet name="header">-->
+<!-- <h:outputText value="Name"/>-->
+<!-- </f:facet>-->
+<!-- </p:column>-->
- <f:facet name="footer">
- <p:separator />
- <h:outputText value="#{warehouseStockMngController.showCodes.size()} themes" style="font-weight:bold;"/>
- </f:facet>
- </p:selectOneMenu>
- </p:column>
+<!-- <f:facet name="footer">-->
+<!-- <p:separator />-->
+<!-- <h:outputText value="#{warehouseStockMngController.showCodes.size()} themes" style="font-weight:bold;"/>-->
+<!-- </f:facet>-->
+<!-- </p:selectOneMenu>-->
+<!-- </p:column>-->
</p:row>
<p:row>
<p:column><p:outputLabel value="条形码开始">
--
Gitblit v1.9.2