From 7de008b21b02b84ee5bd3607c7674c6f79cdf042 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 15 十二月 2020 15:08:20 +0800
Subject: [PATCH] 模块:课题管理 修改：课题名称改课题组 提出：秦老师
---
src/main/webapp/project_mng.xhtml | 6 +++---
src/main/webapp/apply_mng_new.xhtml | 8 ++++----
src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java b/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java
index 5fd9061..645d012 100644
--- a/src/main/java/com/nanometer/smartlab/controller/SupplierOrderMngController.java
+++ b/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("单位");
diff --git a/src/main/webapp/apply_mng_new.xhtml b/src/main/webapp/apply_mng_new.xhtml
index 3115715..463b8c5 100644
--- a/src/main/webapp/apply_mng_new.xhtml
+++ b/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>
diff --git a/src/main/webapp/project_mng.xhtml b/src/main/webapp/project_mng.xhtml
index e1f6840..8556109 100644
--- a/src/main/webapp/project_mng.xhtml
+++ b/src/main/webapp/project_mng.xhtml
@@ -18,7 +18,7 @@
<p:outputLabel value="课题编号："></p:outputLabel>
<p:inputText value="#{projectMngController.projectId}"></p:inputText>
- <p:outputLabel value="课题名称："></p:outputLabel>
+ <p:outputLabel value="课题组："></p:outputLabel>
<p:inputText value="#{projectMngController.projectName}"></p:inputText>
<p:outputLabel value="课题负责人："></p:outputLabel>
@@ -69,7 +69,7 @@
<p:column headerText="课题编号">
<h:outputText value="#{row.projectId}"></h:outputText>
</p:column>
- <p:column headerText="课题名称">
+ <p:column headerText="课题组">
<h:outputText value="#{row.projectName}"></h:outputText>
</p:column>
<p:column headerText="课题负责人">
@@ -97,7 +97,7 @@
</p:row>
<p:row>
<p:column>
- <p:outputLabel value="课题名称"></p:outputLabel>
+ <p:outputLabel value="课题组"></p:outputLabel>
</p:column>
<p:column>
<p:inputText value="#{projectMngController.sysProject.projectName}"></p:inputText>
--
Gitblit v1.9.2