Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-02 aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b

 src/main/webapp/reagent_mng.xhtml

@@ -15,7 +15,7 @@
        <p:panel styleClass="center-header">
            <p:outputLabel styleClass="title" value="试剂管理"></p:outputLabel>

            <p:panelGrid styleClass="filter" columns="9">
            <p:panelGrid styleClass="filter" columns="12">
                <p:outputLabel value="名称："></p:outputLabel>
                <p:inputText value="#{reagentMngController.name}"></p:inputText>
                <p:outputLabel value="CAS："></p:outputLabel>
@@ -28,15 +28,18 @@
                </p:selectOneMenu>
                <p:outputLabel value="种类："></p:outputLabel>
                <p:selectOneMenu value="#{reagentMngController.type}">
                    <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
                    <f:selectItems value="#{reagentMngController.typeList}" var="item"
                                   itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems>
                </p:selectOneMenu>

                <p:outputLabel value="产品编号："></p:outputLabel>
                <p:inputText value="#{reagentMngController.productSn}"></p:inputText>

                <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
            </p:panelGrid>
        </p:panel>
        <p:panel styleClass="center-body">
            <p:panelGrid columns="5" styleClass="btn">
            <p:panelGrid columns="7" styleClass="btn">
                <p:commandButton value="新建" styleClass="new-btn"
                                 process="@this"
                                 actionListener="#{reagentMngController.onNewBtnClick}"
@@ -53,9 +56,11 @@
                    <p:confirm header="确认" message="确认操作？"></p:confirm>
                </p:commandButton>
            <p:commandButton value="试剂导入" styleClass="import-btn" onclick="importReagent()"
            ></p:commandButton>
                ></p:commandButton>
                <a href="resources/template/试剂导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
                <p:commandButton value="耗材导入" styleClass="import-btn" onclick="importReagent2()"
                ></p:commandButton>
                <a href="resources/template/耗材导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
                <script>
               function importReagent(){
                  $("#reagentMngForm\\:importReagentBtn_input").click();
@@ -86,6 +91,9 @@
                </p:column>
                <p:column headerText="名称">
                    <h:outputText value="#{row.name}"></h:outputText>
                </p:column>
                <p:column headerText="产品编号">
                    <h:outputText value="#{row.productSn}"></h:outputText>
                </p:column>
                <p:column headerText="CAS">
                    <h:outputText value="#{row.cas}"></h:outputText>
@@ -126,12 +134,12 @@
                   <p:column headerText="每箱数量">
                            <h:outputText value="#{row.perBox}"></h:outputText>
                        </p:column>
                        <p:column headerText="库存">
                            <h:outputText value="#{row.reserve}"></h:outputText>
                        </p:column>
                        <p:column headerText="货期">
                            <h:outputText value="#{row.deadline}"></h:outputText>
                        </p:column>
<!--                        <p:column headerText="库存">-->
<!--                            <h:outputText value="#{row.reserve}"></h:outputText>-->
<!--                        </p:column>-->
<!--                        <p:column headerText="货期">-->
<!--                            <h:outputText value="#{row.deadline}"></h:outputText>-->
<!--                        </p:column>-->
            </p:dataTable>
        </p:panel>
          <div style="display: none" id='importDv'>
@@ -175,7 +183,7 @@
                    </p:column>
                    <p:column>
                        <p:inputText value="#{reagentMngController.sysReagent.cas}" maxlength="100"
                             required="true"        requiredMessage="请输入CAS"></p:inputText>
                             required="true"        requiredMessage="请输入CAS"  onkeyup="this.value=this.value.replace(/\s/g,'')"></p:inputText>
                    </p:column>
                </p:row>
                <p:row>