施工交底02

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -59,9 +59,9 @@ public class ConstructionController extends BaseController {
 	public String form(@PathVariable String mode, Construction construction, Model model) {
 		model.addAttribute("construction", construction);
 		if("add".equals(mode) || "edit".equals(mode)){
-			return "modules/test/activiti/oALeaveForm";
+			return "modules/sg/managementcenter/activiti/constructionForm";
 		}else{//audit
-			return "modules/test/activiti/oALeaveAudit";
+			return "modules/sg/managementcenter/activiti/constructionAudit";
 		}
 	}
 

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

@@ -22,13 +22,13 @@
 
 			$("#agree").click(function () {
 				jp.prompt("同意, 审批意见", function (message) {
-					jp.post("${ctx}/act/task/audit",
+					jp.post("${ctx}/managementcenter/activiti/audit",
 							{
-								"taskId":"${oALeave.act.taskId}",
-								"taskName":"${oALeave.act.taskName}",
-								"taskDefKey":"${oALeave.act.taskDefKey}",
-								"procInsId":"${oALeave.act.procInsId}",
-								"procDefId":"${oALeave.act.procDefId}",
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.act.procDefId}",
 								"flag":"yes",
 								"comment":message
 
@@ -45,13 +45,13 @@
 
 			$("#reject").click(function () {
 				jp.prompt("驳回, 审批意见", function (message) {
-					jp.post("${ctx}/act/task/audit",
+					jp.post("${ctx}/managementcenter/activiti/audit",
 							{
-								"taskId":"${oALeave.act.taskId}",
-								"taskName":"${oALeave.act.taskName}",
-								"taskDefKey":"${oALeave.act.taskDefKey}",
-								"procInsId":"${oALeave.act.procInsId}",
-								"procDefId":"${oALeave.act.procDefId}",
+								"taskId":"${construction.act.taskId}",
+								"taskName":"${construction.act.taskName}",
+								"taskDefKey":"${construction.act.taskDefKey}",
+								"procInsId":"${construction.act.procInsId}",
+								"procDefId":"${construction.act.procDefId}",
 								"flag":"no",
 								"comment":message
 
@@ -106,37 +106,44 @@
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/activiti/save" method="post" class="form-horizontal">
 						<form:hidden path="id"/>
 						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>请假类型：</label>
+							<label class="col-sm-2 control-label"><font color="red">*</font>申请人：</label>
 							<div class="col-sm-10">
-									${fns:getDictLabel(oALeave.leaveType, 'oa_leave_type', '')}
+									${fns:unescapeHtml(construction.userName)}
 							</div>
 						</div>
 						<hr>
 						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>请假开始时间：</label>
+							<label class="col-sm-2 control-label"><font color="red">*</font>项目号：</label>
 							<div class="col-sm-10">
-								<fmt:formatDate value="${oALeave.startTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+									${fns:unescapeHtml(construction.projectId)}
 							</div>
 						</div>
 						<hr>
 						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>请假结束时间：</label>
+							<label class="col-sm-2 control-label"><font color="red">*</font>项目名称：</label>
 							<div class="col-sm-10">
-								<fmt:formatDate value="${oALeave.endTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+									${fns:unescapeHtml(construction.projectName)}
 							</div>
 						</div>
 						<hr>
 						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>请假理由：</label>
+							<label class="col-sm-2 control-label"><font color="red">*</font>接收图纸时间：</label>
 							<div class="col-sm-10">
-									${fns:unescapeHtml(oALeave.reason)}
+								<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>查看时间：</label>
+							<div class="col-sm-10">
+								<fmt:formatDate value="${construction.examineDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 							</div>
 						</div>
 						<hr>
 					</form:form>
 
 
-					<c:if test="${oALeave.act.taskDefKey != '' && !oALeave.act.finishTask && oALeave.act.isNextGatewaty}">
+					<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && construction.act.isNextGatewaty}">
 						<div class="row">
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">
@@ -147,7 +154,7 @@
 							</div>
 						</div>
 					</c:if>
-					<c:if test="${oALeave.act.taskDefKey != '' && !oALeave.act.finishTask && !oALeave.act.isNextGatewaty}">
+					<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && !construction.act.isNextGatewaty}">
 						<div class="row">
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">
@@ -158,9 +165,9 @@
 						</div>
 					</c:if>
 
-					<c:if test="${not empty oALeave.id}">
-						<act:flowChart procInsId="${oALeave.act.procInsId}"/>
-						<act:histoicFlow procInsId="${oALeave.act.procInsId}" />
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
 					</c:if>
 
 				</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionForm.jsp

@@ -61,32 +61,46 @@
 							<h3> 施工交底申请</h3>
 						</div>
 						<div class="form-group">
+							<label class="col-sm-2 control-label"><font color="red">*</font>申请人：</label>
+							<div class="col-sm-10">
+								<div class='input-group form_datetime' id='userName'>
+									<input type='text'  name="startTime" class="form-control required"  value="${construction.userName}"/>
+									<span class="input-group-addon">
+									<span class="glyphicon glyphicon-calendar"></span>
+									</span>
+								</div>
+							</div>
+						</div>
+						<hr>
+						<div class="form-group">
 							<label class="col-sm-2 control-label"><font color="red">*</font>项目号：</label>
 							<div class="col-sm-10">
-								<form:select path="leaveType" class="form-control required">
-									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('oa_leave_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-								</form:select>
+								<div class='input-group form_datetime' id='projectId'>
+									<input type='text'  name="startTime" class="form-control required"  value="${construction.projectId}"/>
+									<span class="input-group-addon">
+									<span class="glyphicon glyphicon-calendar"></span>
+									</span>
+								</div>
 							</div>
 						</div>
 						<hr>
 						<div class="form-group">
 							<label class="col-sm-2 control-label"><font color="red">*</font>项目名称：</label>
 							<div class="col-sm-10">
-								<div class='input-group form_datetime' id='startTime'>
-									<input type='text'  name="startTime" class="form-control required"  value="<fmt:formatDate value="${oALeave.startTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+								<div class='input-group form_datetime' id='projectName'>
+									<input type='text'  name="startTime" class="form-control required"  value="${construction.projectName}"/>
 									<span class="input-group-addon">
-								<span class="glyphicon glyphicon-calendar"></span>
-							</span>
+									<span class="glyphicon glyphicon-calendar"></span>
+									</span>
 								</div>
 							</div>
 						</div>
 						<hr>
 						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>请假结束时间：</label>
+							<label class="col-sm-2 control-label"><font color="red">*</font>接收图纸时间：</label>
 							<div class="col-sm-10">
-								<div class='input-group form_datetime' id='endTime'>
-									<input type='text'  name="endTime" class="form-control required"  value="<fmt:formatDate value="${oALeave.endTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+									<div class='input-group form_datetime' id='acceptDate'>
+									<input type='text'  name="endTime" 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>
@@ -95,18 +109,20 @@
 						</div>
 						<hr>
 						<div class="form-group">
-							<label class="col-sm-2 control-label"><font color="red">*</font>请假理由：</label>
+							<label class="col-sm-2 control-label"><font color="red">*</font>查看时间：</label>
 							<div class="col-sm-10">
-								<input type="hidden" name="reason" value=" ${oALeave.reason}"/>
-								<div id="reason">
-										${fns:unescapeHtml(oALeave.reason)}
+								<div class='input-group form_datetime' id='examineDate'>
+									<input type='text'  name="endTime" class="form-control required"  value="<fmt:formatDate value="${construction.examineDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+									<span class="input-group-addon">
+								<span class="glyphicon glyphicon-calendar"></span>
+							</span>
 								</div>
 							</div>
 						</div>
 						<hr>
 						<div class="form-group">
 							<div class="col-lg-3"></div>
-							<c:if test="${oALeave.act.taskDefKey ne '' && !oALeave.act.finishTask && oALeave.act.isNextGatewaty}">
+							<c:if test="${construction.act.taskDefKey ne '' && !construction.act.finishTask && construction.act.isNextGatewaty}">
 								<div class="col-sm-6">
 									<div class="form-group text-center">
 										<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="重新提交" onclick="$('#flag').val('yes')"/>&nbsp;
@@ -114,7 +130,7 @@
 									</div>
 								</div>
 							</c:if>
-							<c:if test="${oALeave.act.startTask}">
+							<c:if test="${construction.act.startTask}">
 								<div class="col-lg-6">
 									<div class="form-group text-center">
 										<div>
@@ -125,9 +141,9 @@
 							</c:if>
 						</div>
 					</form:form>
-					<c:if test="${not empty oALeave.id}">
-						<act:flowChart procInsId="${oALeave.act.procInsId}"/>
-						<act:histoicFlow procInsId="${oALeave.act.procInsId}" />
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
 					</c:if>
 				</div>
 			</div>