浏览代码

选取人员修改

yue 5 年之前
父节点
当前提交
9a8c104bfd

文件差异内容过多而无法显示
+ 589 - 574
src/main/java/com/jeeplus/modules/sys/web/UserController.java


+ 2 - 2
src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionAudit.jsp

@@ -223,9 +223,9 @@
 								<td class="width-35">
 										${fns:unescapeHtml(construction.userName)}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审人:</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审人:</label></td>
 								<td class="width-35">
-									<sys:userselect id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+									<sys:userselect roleName="施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
 <%--									<sys:fileUpload path="pic" fileNumLimit="2" fileSizeLimit="50" value="${testPic.pic}" type="image" uploadPath="/test/pic/testPic"></sys:fileUpload>--%>
 								</td>

+ 19 - 6
src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionForm.jsp

@@ -127,26 +127,35 @@
 								<td class="width-35">
 									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>归属用户:</label></td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>审批人:</label></td>
 								<td class="width-35">
-									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
+									<sys:userselect roleName="项目经理" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
 								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目号:</label></td>
+<%--								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目号:</label></td>
 								<td class="width-35">
 									<input type='text'  name="projectId" class="form-control required"  value="${construction.projectId}"/>
-								</td>
+								</td>--%>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称:</label></td>
 								<td class="width-35">
 									<%--<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>--%>
 									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataSys" id="project" name="project.id" value="${project.id}" labelName="project.requireName" labelValue="${project.requireName}"
 													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('需求编号|项目需求名称|需求提出单位|变电站名称|线路名称|设备基本情况|运行班')}" fieldKeys="id|requireName|demandUnit|bdzName|lineName|asicEquipment|runTheClass" searchLabels="${fns:urlEncode('需求编号|项目需求名称')}" searchKeys="id|requireName" ></sys:itemselect>
 								</td>
+								<td class="width-15 active"><label class="pull-right">接收图纸时间:</label></td>
+								<td class="width-35">
+									<div class='input-group form_datetime' id='acceptDate'>
+										<input type='text'  name="acceptDate" class="form-control required"  value="<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+										<span class="input-group-addon">
+																<span class="glyphicon glyphicon-calendar"></span>
+																 </span>
+									</div>
+								</td>
 							</tr>
 							<tr>
-								<td class="width-15 active"><label class="pull-right">接收图纸时间:</label></td>
+<%--								<td class="width-15 active"><label class="pull-right">接收图纸时间:</label></td>
 								<td class="width-35">
 									<div class='input-group form_datetime' id='acceptDate'>
 										<input type='text'  name="acceptDate" class="form-control required"  value="<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
@@ -154,11 +163,15 @@
 			                        <span class="glyphicon glyphicon-calendar"></span>
 			                   		 </span>
 									</div>
-								</td>
+								</td>--%>
 								<td class="width-15 active"><label class="pull-right">备注说明:</label></td>
 								<td class="width-35">
 									<textarea  name="examineDate" style="height: 100px" class="form-control">${construction.examineDate}</textarea>
 								</td>
+								<td class="width-15 active"><label class="pull-right"></label></td>
+								<td class="width-35">
+<%--									<textarea  name="examineDate" style="height: 100px" class="form-control">${construction.examineDate}</textarea>--%>
+								</td>
 							</tr>
 							</tbody>
 						</table>