From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/webapp/project_mng.xhtml | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/project_mng.xhtml b/src/main/webapp/project_mng.xhtml
index e1f6840..3bdd44b 100644
--- a/src/main/webapp/project_mng.xhtml
+++ b/src/main/webapp/project_mng.xhtml
@@ -16,7 +16,7 @@
<p:outputLabel styleClass="title" value="课题管理"></p:outputLabel>
<p:panelGrid styleClass="filter" columns="8">
<p:outputLabel value="课题编号："></p:outputLabel>
- <p:inputText value="#{projectMngController.projectId}"></p:inputText>
+ <p:inputText value="#{projectMngController.projectNo}"></p:inputText>
<p:outputLabel value="课题名称："></p:outputLabel>
<p:inputText value="#{projectMngController.projectName}"></p:inputText>
@@ -67,7 +67,7 @@
rows="20" pageLinks="5">
<p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>
<p:column headerText="课题编号">
- <h:outputText value="#{row.projectId}"></h:outputText>
+ <h:outputText value="#{row.projectNo}"></h:outputText>
</p:column>
<p:column headerText="课题名称">
<h:outputText value="#{row.projectName}"></h:outputText>
@@ -75,6 +75,10 @@
<p:column headerText="课题负责人">
<!-- <h:outputText value="#{projectMngController.userIdNameMap.get(row.sysUserId)}"></h:outputText>-->
<h:outputText value="#{row.username}"></h:outputText>
+ </p:column>
+ <p:column headerText="课题组">
+ <!-- <h:outputText value="#{projectMngController.userIdNameMap.get(row.sysUserId)}"></h:outputText>-->
+ <h:outputText value="#{row.project}"></h:outputText>
</p:column>
<p:column headerText="备注">
<h:outputText value="#{row.remark}"></h:outputText>
@@ -92,7 +96,7 @@
<p:outputLabel value="课题编号"></p:outputLabel>
</p:column>
<p:column>
- <p:inputText value="#{projectMngController.sysProject.projectId}"></p:inputText>
+ <p:inputText value="#{projectMngController.sysProject.projectNo}" required="true" requiredMessage="请填写课题编号"></p:inputText>
</p:column>
</p:row>
<p:row>
@@ -100,7 +104,7 @@
<p:outputLabel value="课题名称"></p:outputLabel>
</p:column>
<p:column>
- <p:inputText value="#{projectMngController.sysProject.projectName}"></p:inputText>
+ <p:inputText value="#{projectMngController.sysProject.projectName}" required="true" requiredMessage="请填写课题名称"></p:inputText>
</p:column>
</p:row>
<p:row>
@@ -112,16 +116,23 @@
var="item"
dropdown="true"
styleClass="apply-user-autocomplete"
- itemLabel="#{!empty projectMngController.sysProject.sysUserId ?projectMngController.getSelectedUserById(projectMngController.sysProject.sysUserId).name : item.name}"
- itemValue="#{item.id}" forceSelection="true">
+ itemLabel="#{!empty projectMngController.sysProject and !empty projectMngController.sysProject.sysUserId ? projectMngController.getSelectedUserById(projectMngController.sysProject.sysUserId).name: (!empty item?item.name:'')}"
+ itemValue="#{!empty item ? item.id:''}" forceSelection="true">
<p:ajax event="itemSelect" process="@this" update="@this" />
<p:column>
- <h:outputText value="#{item.name}" />
+ <h:outputText value="#{item.name}" required="true" requiredMessage="请填写课题负责人"/>
</p:column>
</p:autoComplete>
</p:column>
</p:row>
-
+ <p:row>
+ <p:column>
+ <p:outputLabel value="课题组"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:inputText value="#{projectMngController.sysProject.project}" required="true" requiredMessage="请填写课题组"></p:inputText>
+ </p:column>
+ </p:row>
<!--<p:selectOneMenu value="#{projectMngController.sysProject.sysUserId}"
required="true" requiredMessage="请选择负责人">
--
Gitblit v1.9.2