耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材

李宇

2021-08-18 a1e90c3da21d88f994bac9c1feb91bf40e53a44d

 src/main/webapp/user_mng.xhtml

@@ -15,39 +15,53 @@
        <p:panel styleClass="center-header">
            <p:outputLabel styleClass="title" value="用户管理"></p:outputLabel>

            <p:panelGrid styleClass="filter" columns="7">
            <p:panelGrid styleClass="filter" columns="11">
                <p:outputLabel value="ARP号："></p:outputLabel>
                <p:inputText value="#{userMngController.arp}"></p:inputText>

                <p:outputLabel value="姓名："></p:outputLabel>
                <p:inputText value="#{userMngController.name}"></p:inputText>

                <p:outputLabel value="课题组："></p:outputLabel>
                <p:inputText value="#{userMngController.project}"></p:inputText>

                <p:outputLabel value="部门："></p:outputLabel>
                <p:inputText value="#{userMngController.departmentName}"></p:inputText>

                <p:outputLabel value="单位："></p:outputLabel>
                <p:inputText value="#{userMngController.company}"></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="6" styleClass="btn">
                <p:commandButton value="新建" styleClass="new-btn"
                                 process="@this"
                                 process="@form"
                                 actionListener="#{userMngController.onNewBtnClick}"
                                 oncomplete="PF('dialog').show();"
                                 update=":dialog,:dialogForm"></p:commandButton>
                                 update=":dialog,:dialogForm"
                                 rendered="#{userMngController.isAccess('新增')}"></p:commandButton>
                <p:commandButton value="修改" styleClass="edit-btn"
                                 process="@form"
                                 actionListener="#{userMngController.onEditBtnClick}"
                                 update=":dialog,:dialogForm"></p:commandButton>
                                 update=":dialog,:dialogForm"
                                 rendered="#{userMngController.isAccess('修改')}"></p:commandButton>
                <p:commandButton value="删除" styleClass="del-btn"
                                 process="@form"
                                 actionListener="#{userMngController.onDeleteBtnClick}"
                                 update="@form">
                                 update="@form"
                                 rendered="#{userMngController.isAccess('删除')}">
                    <p:confirm header="确认" message="确认操作？"></p:confirm>
                </p:commandButton>
                <p:commandButton value="导入" styleClass="import-btn" onclick="importUser()"
                                 rendered="#{userMngController.isAccess('导入')}"
                ></p:commandButton>
                <a href="resources/template/用户导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
                <p:outputLabel rendered="#{userMngController.isAccess('导入')}">
                    <a href="resources/template/用户导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
                </p:outputLabel>
                <p:commandButton value="导出" styleClass="new-btn" ajax="false"  actionListener="#{userMngController.exportLab2Excel}"
                />
                <script>
                    function importUser(){
                        $("#userMngForm\\:importUserBtn_input").click();
@@ -85,7 +99,7 @@
                </p:column>

                <p:column headerText="课题组">
                    <h:outputText value="#{sysProjectServiceImpl.getSysProject(row.projectId).projectName}"></h:outputText>
                    <h:outputText value="#{row.project}"></h:outputText>
                </p:column>

                <p:column headerText="ARP">
@@ -128,6 +142,10 @@
                    <h:outputText value="#{row.seeFlag!=null?row.seeFlag.text:''}"></h:outputText>
                </p:column>

                <p:column headerText="危废人员">
                    <h:outputText value="#{row.waster!=null?row.waster.text:''}"></h:outputText>
                </p:column>

                <p:column headerText="更新时间">
                    <h:outputText value="#{row.updateTime!=null?row.updateTime:''}">
                        <f:convertDateTime pattern="yyyy-M-d HH:mm" /></h:outputText>
@@ -166,10 +184,10 @@
                             required="true" requiredMessage="请输入ARP号"></p:inputText>

                <p:outputLabel value="课题组"></p:outputLabel>
                <p:selectOneMenu value="#{userMngController.sysUser.projectId}">
                    <f:selectItem itemLabel="不选择课题组"  />
                <p:selectOneMenu value="#{userMngController.sysUser.project}" filter="true" filterMatchMode="startsWith">
                    <f:selectItem itemLabel="不选择课题组" />
                    <f:selectItems value="#{sysProjectServiceImpl.getAll()}"
                                   var="item" itemLabel="#{item.project}"  itemValue="#{item.id}"></f:selectItems>
                                   var="item" itemLabel="#{item.project}"  itemValue="#{item.project}"></f:selectItems>
                </p:selectOneMenu>

                <p:outputLabel value="姓名"></p:outputLabel>
@@ -179,12 +197,11 @@
                <p:outputLabel value="账号"></p:outputLabel>
                <p:inputText value="#{userMngController.sysUser.account}" maxlength="100"
                             required="true" requiredMessage="请输入账号"
                             disabled="#{userMngController.action == constants.ACTION_EDIT}"></p:inputText>
                             disabled="#{userMngController.action == constants.ACTION_EDIT}" autocomplete="off"></p:inputText>

                <p:outputLabel value="密码" ></p:outputLabel>
                <p:password value="#{userMngController.sysUser.password}" maxlength="100"
                             requiredMessage="请输入密码"
                            ></p:password>
                             requiredMessage="请输入密码" autocomplete="off"></p:password>

                <p:outputLabel value="电话"></p:outputLabel>
                <p:inputText value="#{userMngController.sysUser.phone}" maxlength="30"></p:inputText>
@@ -225,6 +242,14 @@
                <p:inputTextarea autoResize="false" style="height: 80px"
                                 value="#{userMngController.sysUser.memo}"
                                 maxlength="200"></p:inputTextarea>

                <p:outputLabel value="危废角色"></p:outputLabel>
                <p:selectOneMenu value="#{userMngController.sysUser.waster}"
                                 required="true" requiredMessage="请选择危废角色">
                    <f:converter converterId="wasterConvert"></f:converter>
                    <f:selectItems value="#{userMngController.wasterSelectList}"
                                   var="item" itemLabel="#{item.text}" itemValue="#{item}"></f:selectItems>
                </p:selectOneMenu>
            </p:panelGrid>
            <p:panel styleClass="btn">
                <p:commandButton value="保存" actionListener="#{userMngController.onSaveBtnClick}"