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/warehouse_stock_mng.xhtml | 454 ++++++++++++++++++++++++++++----------------------------
1 files changed, 228 insertions(+), 226 deletions(-)
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index d13c3f1..a97ef7d 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -9,67 +9,68 @@
xmlns:c="http://java.sun.com/jsp/jstl/core">
<head></head>
<ui:composition>
- <p:tabView dynamic="true">
- <p:tab title="备货领取">
+ <p:tabView dynamic="true" id="tabView" activeIndex="#{warehouseStockMngController.tabValue}">
+ <p:ajax event="tabChange" listener="#{warehouseStockMngController.onTabChange}"/>
+ <p:tab title="备货领取" id="firstTab">
<div id ="showTab" style="display: none">
- <h:form id="tmp">
- <p:panel styleClass="center-body">
- <p:panelGrid columns="3" styleClass="btn">
- <p:commandButton value="删除" styleClass="del-btn" process="@form"
- actionListener="#{warehouseStockMngController.cancel}"
- update="@(.tempTable)"/>
- <p:commandButton value="清空" styleClass="del-btn" process="@form"
- actionListener="#{warehouseStockMngController.clear}"
- update="@(.tempTable)"/>
- <p:commandButton value="提交" styleClass="edit-btn" process="@form"
- actionListener="#{warehouseStockMngController.onUseBtnClick}"
- update=":centerRootPanel"/>
- </p:panelGrid>
- <p:dataTable id="tempTable" styleClass="tempTable data-table"
- paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
- lazy="true" value="#{warehouseStockMngController.selectedTmpList}" var="row"
- selection="#{warehouseStockMngController.trulySelectedList}"
- rowKey="#{row.id}"
- emptyMessage="无数据" rows="20" pageLinks="5">
- <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
- <p:column headerText="试剂名称">
- <h:outputText value="#{row.reagent.name}"/>
- </p:column>
+ <h:form id="tmp">
+ <p:panel styleClass="center-body">
+ <p:panelGrid columns="3" styleClass="btn">
+ <p:commandButton value="删除" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.cancel}"
+ update="@(.tempTable)"/>
+ <p:commandButton value="清空" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.clear}"
+ update="@(.tempTable)"/>
+ <p:commandButton value="提交" styleClass="edit-btn" process="@form"
+ actionListener="#{warehouseStockMngController.onUseBtnClick}"
+ update=":centerRootPanel"/>
+ </p:panelGrid>
+ <p:dataTable id="tempTable" styleClass="tempTable data-table"
+ paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
+ lazy="true" value="#{warehouseStockMngController.selectedTmpList}" var="row"
+ selection="#{warehouseStockMngController.trulySelectedList}"
+ rowKey="#{row.id}"
+ emptyMessage="无数据" rows="20" pageLinks="5">
+ <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
+ <p:column headerText="试剂名称">
+ <h:outputText value="#{row.reagent.name}"/>
+ </p:column>
- <p:column headerText="CAS">
- <h:outputText value="#{row.reagent.cas}"/>
- </p:column>
+ <p:column headerText="CAS">
+ <h:outputText value="#{row.reagent.cas}"/>
+ </p:column>
- <p:column headerText="厂家">
- <h:outputText value="#{row.reagent.productHomeName}"/>
- </p:column>
- <p:column headerText="供应商">
- <h:outputText value="#{row.reagent.supplierName}"/>
- </p:column>
+ <p:column headerText="厂家">
+ <h:outputText value="#{row.reagent.productHomeName}"/>
+ </p:column>
+ <p:column headerText="供应商">
+ <h:outputText value="#{row.reagent.supplierName}"/>
+ </p:column>
- <p:column headerText="规格">
- <h:outputText
- value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"/>
- </p:column>
+ <p:column headerText="规格">
+ <h:outputText
+ value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"/>
+ </p:column>
- <p:column headerText="包装">
- <h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"/>
- </p:column>
+ <p:column headerText="包装">
+ <h:outputText
+ value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"/>
+ </p:column>
- <p:column headerText="批号">
- <h:outputText value="#{row.articleNumber}"/>
- </p:column>
+ <p:column headerText="批号">
+ <h:outputText value="#{row.articleNumber}"/>
+ </p:column>
- <p:column headerText="库存">
- <h:outputText value="#{row.reserve}"/>
- </p:column>
- <p:column headerText="仓库">
- <h:outputText value="#{row.warehouseName}"/>
- </p:column>
- </p:dataTable>
- </p:panel>
- </h:form>
+ <p:column headerText="库存">
+ <h:outputText value="#{row.reserve}"/>
+ </p:column>
+ <p:column headerText="仓库">
+ <h:outputText value="#{row.warehouseName}"/>
+ </p:column>
+ </p:dataTable>
+ </p:panel>
+ </h:form>
</div>
<br/>
<h:form id="warehouseStockMngForm">
@@ -83,7 +84,7 @@
<p:selectOneMenu value="#{warehouseStockMngController.supplierId}">
<f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
<f:selectItems value="#{warehouseStockMngController.supplierSelectList}"
- var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
+ var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
</p:selectOneMenu>
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
@@ -92,15 +93,15 @@
<p:panel styleClass="center-body">
<p:panelGrid columns="3" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
<p:commandButton value="领用" styleClass="edit-btn" process="@form"
- actionListener="#{warehouseStockMngController.add}"
+ actionListener="#{warehouseStockMngController.add}"
disabled="#{warehouseStockMngController.editFlag==0}"
- oncomplete="$('#showTab').css('display','block');"
- update="@(.tempTable)"></p:commandButton>
+ oncomplete="$('#showTab').css('display','block');"
+ update="@(.tempTable)"></p:commandButton>
<p:commandButton value="入库" styleClass="ruku-btn"
- process="@form"
+ process="@form"
disabled="#{warehouseStockMngController.editFlag==0}"
- actionListener="#{warehouseStockMngController.onDStoreBtnClick}"
- update=":centerRootPanel"></p:commandButton>
+ actionListener="#{warehouseStockMngController.onDStoreBtnClick}"
+ update=":centerRootPanel"></p:commandButton>
<p:commandButton update=":centerRootPanel" actionListener="#{warehouseStockMngController.onExportFileBtnClickNew}"
ajax="false" value="导出" styleClass="new-btn" />
<!--<p:commandButton value="导入" styleClass="import-btn" onclick="importStock()"
@@ -123,10 +124,10 @@
</p:panelGrid>
<p:dataTable id="warehouseStockMngDataTable" styleClass="data-table"
- paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
- lazy="true" value="#{warehouseStockMngController.dataModel}" var="row"
- selection="#{warehouseStockMngController.selectedList}" rowKey="#{row.id}"
- emptyMessage="无数据" rows="20" pageLinks="5">
+ paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
+ lazy="true" value="#{warehouseStockMngController.dataModel}" var="row"
+ selection="#{warehouseStockMngController.selectedList}" rowKey="#{row.id}"
+ emptyMessage="无数据" rows="20" pageLinks="5">
<p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
<p:column headerText="试剂名称">
<h:outputText value="#{row.reagent.name}"></h:outputText>
@@ -149,12 +150,12 @@
<p:column headerText="规格">
<h:outputText
- value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"></h:outputText>
+ value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"></h:outputText>
</p:column>
<p:column headerText="包装">
<h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"></h:outputText>
+ value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"></h:outputText>
</p:column>
<p:column headerText="批号">
@@ -177,6 +178,166 @@
</div>
</h:form>
</p:tab>
+ <p:tab title="订单领取" id="secondTab">
+ <div id ="showTabOrder" style="display: none">
+ <h:form id="tmpOrder" styleClass="tmpOrder">
+ <p:panel styleClass="center-body">
+ <p:panelGrid columns="3" styleClass="btn">
+ <p:commandButton value="删除" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.cancelOrderTmp}"
+ update="@(.tmpOrder)"
+ />
+ <p:commandButton value="清空" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.clearOrderTmp}"
+ update="@(.tmpOrder)"
+ />
+ <p:commandButton value="提交" styleClass="edit-btn" process="@form"
+ actionListener="#{warehouseStockMngController.onUseBtnClickOrderTmp}"
+ update=":centerRootPanel"/>
+ </p:panelGrid>
+ <p:dataTable id="tempOrderTable" styleClass="data-table"
+ paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
+ lazy="true" value="#{warehouseStockMngController.selectedTmpOrderList}" var="row"
+ selection="#{warehouseStockMngController.trulySelectedOrderList}"
+ rowKey="#{row.id}"
+ emptyMessage="无数据" rows="20" pageLinks="5">
+ <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
+ <p:column headerText="试剂名称">
+ <h:outputText value="#{row.reagent.name}"/>
+ </p:column>
+
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.reagent.productSn}"/>
+ </p:column>
+
+ <p:column headerText="CAS">
+ <h:outputText value="#{row.reagent.cas}"/>
+ </p:column>
+
+ <p:column headerText="规格">
+ <h:outputText value="#{row.reagent.reagentFormat}"/>
+ </p:column>
+
+ <p:column headerText="危险性质">
+ <h:outputText value="#{row.reagent.reagentCharacter}"/>
+ </p:column>
+ <p:column headerText="价格">
+ <h:outputText value="#{row.reagent.price}"/>
+ </p:column>
+
+ <p:column headerText="厂商">
+ <h:outputText
+ value="#{row.reagent.productHome}"/>
+ </p:column>
+
+ <p:column headerText="包装">
+ <h:outputText
+ value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"/>
+ </p:column>
+
+ <p:column headerText="批号">
+ <h:outputText value="#{row.articleNumber}"/>
+ </p:column>
+
+ </p:dataTable>
+ </p:panel>
+ </h:form>
+ </div>
+ <h:form id="warehouseStockMngFormForPerson">
+ <p:panel styleClass="center-header" style="border-bottom:none;">
+ <p:panelGrid styleClass="filter" columns="5">
+
+ <p:outputLabel value="试剂名称："></p:outputLabel>
+ <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
+ <p:outputLabel value="申领人："></p:outputLabel>
+ <p:inputText value="#{warehouseStockMngController.userName}"></p:inputText>
+
+ <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
+ </p:panelGrid>
+ </p:panel>
+
+ <p:panel styleClass="center-body">
+
+ <p:panelGrid columns="2" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
+
+ <p:commandButton value="领用" styleClass="edit-btn" process="@form"
+ actionListener="#{warehouseStockMngController.addOrder}"
+ disabled="#{warehouseStockMngController.editFlag==0}"
+ oncomplete="$('#showTabOrder').css('display','block');"
+ update="@(.tmpOrder)"
+ ></p:commandButton>
+ </p:panelGrid>
+
+ <p:dataTable id="warehouseStockMngDataTableForPerson" styleClass="data-table"
+ paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
+ lazy="true" value="#{warehouseStockMngController.dataModelForPerson}" var="row"
+ selection="#{warehouseStockMngController.selectedListForPerson}" rowKey="#{row.id}"
+ emptyMessage="无数据" rows="20" pageLinks="5">
+ <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
+
+ <p:column headerText="申购编号" width="150">
+ <h:outputText value="#{row.applyCode}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.reagent.productSn}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="试剂名称">
+ <h:outputText value="#{row.reagent.name}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="管制品">
+ <h:outputText value="#{row.reagent.controlProducts}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="规格型号">
+ <h:outputText
+ value="#{row.reagent.reagentFormat}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="包装">
+ <h:outputText
+ value="#{row.reagent.mainMetering}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="价格">
+ <h:outputText value="#{row.reagent.price}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="CAS">
+ <h:outputText value="#{row.reagent.cas}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="危险性质">
+ <h:outputText value="#{row.reagent.reagentCharacter}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="厂家">
+ <h:outputText value="#{row.reagent.productHome}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="申请数量">
+ <h:outputText value="#{row.num}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="已领用数量">
+ <h:outputText value="#{row.used}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="申领人">
+ <h:outputText value="#{row.applyUserId}" />
+ </p:column>
+ <p:column headerText="订单状态">
+ <h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
+ </p:column>
+ </p:dataTable>
+ </p:panel>
+ </h:form>
+ </p:tab>
+
+
+
<!-- 目前领取记录查询是最新状态试剂表，应该是试剂履历表。目前客户不太需要这个画面，所以先去掉了 -->
<!--
<p:tab title="领取记录">
@@ -333,165 +494,6 @@
</p:tab>
-->
-
- <p:tab title="订单领取">
- <div id ="showTabOrder" style="display: none">
- <h:form id="tmpOrder" styleClass="tmpOrder">
- <p:panel styleClass="center-body">
- <p:panelGrid columns="3" styleClass="btn">
- <p:commandButton value="删除" styleClass="del-btn" process="@form"
- actionListener="#{warehouseStockMngController.cancelOrderTmp}"
- update="@(.tmpOrder)"
- />
- <p:commandButton value="清空" styleClass="del-btn" process="@form"
- actionListener="#{warehouseStockMngController.clearOrderTmp}"
- update="@(.tmpOrder)"
- />
- <p:commandButton value="提交" styleClass="edit-btn" process="@form"
- actionListener="#{warehouseStockMngController.onUseBtnClickOrderTmp}"
- update=":centerRootPanel"/>
- </p:panelGrid>
- <p:dataTable id="tempOrderTable" styleClass="data-table"
- paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
- lazy="true" value="#{warehouseStockMngController.selectedTmpOrderList}" var="row"
- selection="#{warehouseStockMngController.trulySelectedOrderList}"
- rowKey="#{row.id}"
- emptyMessage="无数据" rows="20" pageLinks="5">
- <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
- <p:column headerText="试剂名称">
- <h:outputText value="#{row.reagent.name}"/>
- </p:column>
-
- <p:column headerText="产品编号">
- <h:outputText value="#{row.reagent.productSn}"/>
- </p:column>
-
- <p:column headerText="CAS">
- <h:outputText value="#{row.reagent.cas}"/>
- </p:column>
-
- <p:column headerText="规格">
- <h:outputText value="#{row.reagent.reagentFormat}"/>
- </p:column>
-
- <p:column headerText="危险性质">
- <h:outputText value="#{row.reagent.reagentCharacter}"/>
- </p:column>
- <p:column headerText="价格">
- <h:outputText value="#{row.reagent.price}"/>
- </p:column>
-
- <p:column headerText="厂商">
- <h:outputText
- value="#{row.reagent.productHome}"/>
- </p:column>
-
- <p:column headerText="包装">
- <h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"/>
- </p:column>
-
- <p:column headerText="批号">
- <h:outputText value="#{row.articleNumber}"/>
- </p:column>
-
- </p:dataTable>
- </p:panel>
- </h:form>
- </div>
- <h:form id="warehouseStockMngFormForPerson">
- <p:panel styleClass="center-header" style="border-bottom:none;">
- <p:panelGrid styleClass="filter" columns="5">
-
- <p:outputLabel value="试剂名称："></p:outputLabel>
- <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
- <p:outputLabel value="申领人："></p:outputLabel>
- <p:inputText value="#{warehouseStockMngController.userName}"></p:inputText>
-
- <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
- </p:panelGrid>
- </p:panel>
-
- <p:panel styleClass="center-body">
-
- <p:panelGrid columns="2" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
-
- <p:commandButton value="领用" styleClass="edit-btn" process="@form"
- actionListener="#{warehouseStockMngController.addOrder}"
- disabled="#{warehouseStockMngController.editFlag==0}"
- oncomplete="$('#showTabOrder').css('display','block');"
- update="@(.tmpOrder)"
- ></p:commandButton>
- </p:panelGrid>
-
- <p:dataTable id="warehouseStockMngDataTableForPerson" styleClass="data-table"
- paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
- lazy="true" value="#{warehouseStockMngController.dataModelForPerson}" var="row"
- selection="#{warehouseStockMngController.selectedListForPerson}" rowKey="#{row.id}"
- emptyMessage="无数据" rows="20" pageLinks="5">
- <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
-
- <p:column headerText="申购编号">
- <h:outputText value="#{row.applyCode}"></h:outputText>
- </p:column>
-
- <p:column headerText="产品编号">
- <h:outputText value="#{row.reagent.productSn}"></h:outputText>
- </p:column>
-
- <p:column headerText="试剂名称">
- <h:outputText value="#{row.reagent.name}"></h:outputText>
- </p:column>
-
- <p:column headerText="管制品">
- <h:outputText value="#{row.reagent.controlProducts}"></h:outputText>
- </p:column>
-
- <p:column headerText="规格型号">
- <h:outputText
- value="#{row.reagent.reagentFormat}"></h:outputText>
- </p:column>
-
- <p:column headerText="包装">
- <h:outputText
- value="#{row.reagent.mainMetering}"></h:outputText>
- </p:column>
-
- <p:column headerText="价格">
- <h:outputText value="#{row.reagent.price}"></h:outputText>
- </p:column>
-
- <p:column headerText="CAS">
- <h:outputText value="#{row.reagent.cas}"></h:outputText>
- </p:column>
-
- <p:column headerText="危险性质">
- <h:outputText value="#{row.reagent.reagentCharacter}"></h:outputText>
- </p:column>
-
- <p:column headerText="厂家">
- <h:outputText value="#{row.reagent.productHome}"></h:outputText>
- </p:column>
-
- <p:column headerText="申请数量">
- <h:outputText value="#{row.num}"></h:outputText>
- </p:column>
-
- <p:column headerText="已领用数量">
- <h:outputText value="#{row.used}"></h:outputText>
- </p:column>
-
- <p:column headerText="申领人">
- <h:outputText value="#{row.applyUserId}" />
- </p:column>
- <p:column headerText="订单状态">
- <h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
- </p:column>
- </p:dataTable>
- </p:panel>
- </h:form>
- </p:tab>
-
</p:tabView>
</ui:composition>
</html>
--
Gitblit v1.9.2