gdg
2021-02-23 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a
Merge remote-tracking branch 'remotes/origin/yufei' into master
已修改2个文件
13 ■■■■■ 文件已修改
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/warehouse_stock_mng.xhtml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -542,6 +542,12 @@
        selectedInputStorageTmpOrderList = null;
    }
    public void hideInputStorageTmp(){
        selectedInputStorageTmpOrderList = null;
        RequestContext.getCurrentInstance().execute("document.getElementById('putInStorage').style.display='none'");
    }
    public void cancel(){
        if (trulySelectedList == null || trulySelectedList.size()<=0){
            FacesUtils.info("至少选择一个");
src/main/webapp/warehouse_stock_mng.xhtml
@@ -267,7 +267,11 @@
            <div id ="putInStorage" style="display: none">
                <h:form id="putInStorageTmpOrder" styleClass="inputStorageTmp">
                    <p:panel styleClass="center-body">
                        <p:panelGrid columns="3" styleClass="btn">
                        <p:panelGrid columns="4" styleClass="btn">
                            <p:commandButton value="返回" styleClass="import-btn" process="@form"
                                             actionListener="#{warehouseStockMngController.hideInputStorageTmp}"
                                             update="@(.inputStorageTmp)"
                            />
                            <p:commandButton value="删除" styleClass="del-btn" process="@form"
                                             actionListener="#{warehouseStockMngController.cancelInputStorageTmp}"
                                             update="@(.inputStorageTmp)"
@@ -353,6 +357,7 @@
                    </p:panel>
                </h:form>
            </div>
            <br/>
            <h:form id="warehouseStockMngFormForPerson">
                <p:panel styleClass="center-header" style="border-bottom:none;">
                    <p:panelGrid styleClass="filter" columns="14">