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

gdg

2020-12-15 8932ae2a8dc22513c2b7925997dfb65983ea1d19

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

# Conflicts:
#	src/main/webapp/project_mng.xhtml

 src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java

@@ -865,7 +865,7 @@
            headerList.add("试剂类型");
            headerList.add("课题负责人(一级审批者)");
            headerList.add("课题编号");
            headerList.add("课题名称");
            headerList.add("课题组");
            headerList.add("申购人");
            headerList.add("部门");
            headerList.add("单位");

 src/main/webapp/apply_mng_new.xhtml

@@ -176,12 +176,12 @@
                        <p:row>

                            <p:column>
                                <p:outputLabel value="课题名称："></p:outputLabel>
                                <p:outputLabel value="课题组："></p:outputLabel>

                            </p:column>
                            <p:column>
                                <p:selectOneMenu value="#{applyMngController.opeApply.objective}"
                                                 required="true" requiredMessage="请选则课题名称" id="projectIdSel1">
                                                 required="true" requiredMessage="请选则课题组" id="projectIdSel1">
                                    <f:selectItems value="#{applyMngController.sysProjectList}"
                                                   var="item" itemLabel="#{item.projectName}" itemValue="#{item.projectId}"></f:selectItems>
                                </p:selectOneMenu>
@@ -258,9 +258,9 @@
                        <f:ajax listener="#{applyMngController.changeCharge}" render="projectIdSel"/>
                    </p:selectOneMenu>

                    <p:outputLabel value="课题名称："></p:outputLabel>
                    <p:outputLabel value="课题组："></p:outputLabel>
                    <p:selectOneMenu value="#{applyMngController.opeApply.objective}"
                                     required="true" requiredMessage="请选则课题名称" id="projectIdSel">
                                     required="true" requiredMessage="请选择课题组" id="projectIdSel">
                        <f:selectItems value="#{applyMngController.sysProjectList}"
                                       var="item" itemLabel="#{item.projectName}" itemValue="#{item.projectId}"></f:selectItems>
                    </p:selectOneMenu>