Browse Source

施工交底

yue 5 năm trước cách đây
mục cha
commit
a121d44d9d

+ 2 - 2
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/Construction.java

@@ -15,8 +15,8 @@ public class Construction extends ActEntity<Construction> {
     private String userName;		// 申请人
     private String projectId;		// 项目号
     private String projectName;		// 项目名称
-    private Date acceptDate;		// 请假结束时间
-    private Date examineDate;		// 请假理由
+    private Date acceptDate;		// 接收图纸时间
+    private Date examineDate;		// 查看时间
 
 
 

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

@@ -22,7 +22,7 @@
 
 			$("#agree").click(function () {
 				jp.prompt("同意, 审批意见", function (message) {
-					jp.post("${ctx}/managementcenter/activiti/audit",
+					jp.post("${ctx}/act/task/audit",
 							{
 								"taskId":"${construction.act.taskId}",
 								"taskName":"${construction.act.taskName}",

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

@@ -64,7 +64,7 @@
 							<label class="col-sm-2 control-label"><font color="red">*</font>申请人:</label>
 							<div class="col-sm-10">
 								<div class='input-group' id='userName'>
-									<input type='text'  name="startTime" class="form-control required"  value="${construction.userName}"/>
+									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
 								</div>
 							</div>
 						</div>
@@ -73,7 +73,7 @@
 							<label class="col-sm-2 control-label"><font color="red">*</font>项目号:</label>
 							<div class="col-sm-10">
 								<div class='input-group' id='projectId'>
-									<input type='text'  name="startTime" class="form-control required"  value="${construction.projectId}"/>
+									<input type='text'  name="projectId" class="form-control required"  value="${construction.projectId}"/>
 								</div>
 							</div>
 						</div>
@@ -82,7 +82,7 @@
 							<label class="col-sm-2 control-label"><font color="red">*</font>项目名称:</label>
 							<div class="col-sm-10">
 								<div class='input-group form-control' id='projectName'>
-									<input type='text'  name="startTime" class="form-control required"  value="${construction.projectName}"/>
+									<input type='text'  name="projectName" class="form-control required"  value="${construction.projectName}"/>
 								</div>
 							</div>
 						</div>
@@ -91,7 +91,7 @@
 							<label class="col-sm-2 control-label"><font color="red">*</font>接收图纸时间:</label>
 							<div class="col-sm-10">
 									<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"/>"/>
+									<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>
@@ -103,7 +103,7 @@
 							<label class="col-sm-2 control-label"><font color="red">*</font>查看时间:</label>
 							<div class="col-sm-10">
 								<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"/>"/>
+									<input type='text'  name="examineDate" 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>