修改项目关闭页面

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -965,8 +965,8 @@ public class ActTaskController extends BaseController {
 		User user1 = systemService.getUserByLoginName(user.getProjectManageRole());
 		OaNotify  oaNotify = new OaNotify();
 		oaNotify.setType("4");
-		oaNotify.setTitle("施工交底结束");
-		oaNotify.setContent("施工交底结束");
+		oaNotify.setTitle("施工交底结束（项目关闭）");
+		oaNotify.setContent("项目为:["+construction.getProjectName()+"]的项目已经施工交底完成");
 		oaNotify.setStatus("1");
 		oaNotify.setOaNotifyRecordIds(user1.getId());
 		oaNotifyService.save(oaNotify);

src/main/webapp/webpage/modules/oa/notify/oaNotifyFormMaterial.js

@@ -97,33 +97,6 @@ $(document).ready(function() {
             $('#remove').prop('disabled', ! $('#table').bootstrapTable('getSelections').length);
             $('#edit').prop('disabled', $('#table').bootstrapTable('getSelections').length!=1);
         });
-		  
-		$("#btnImport").click(function(){
-			jp.open({
-			    type: 1, 
-			    area: [500, 300],
-			    title:"导入数据",
-			    content:$("#importBox").html() ,
-			    btn: ['下载模板','确定', '关闭'],
-				    btn1: function(index, layero){
-					  window.location='${ctx}/oa/oaNotify/import/template';
-				  },
-			    btn2: function(index, layero){
-				        var inputForm =top.$("#importForm");
-				        var top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe 
-				        inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-				        inputForm.onsubmit = function(){
-				        	jp.loading('  正在导入，请稍等...');
-				        }
-				        inputForm.submit();
-					    jp.close(index);
-				  },
-				 
-				  btn3: function(index){ 
-					  jp.close(index);
-	    	       }
-			}); 
-		});
 		    
 	  $("#search").click("click", function() {// 绑定查询按扭
 		  $('#table').bootstrapTable('refresh');
@@ -137,30 +110,11 @@ $(document).ready(function() {
 		  $('#table').bootstrapTable('refresh');
 		});
 	});
-		
+
   function getIdSelections() {
         return $.map($("#table").bootstrapTable('getSelections'), function (row) {
             return row.id
         });
     }
-
-function deleteAll(){
-
-    jp.confirm('确认要删除通知吗？', function(){
-        jp.loading();
-        jp.get("${ctx}/oa/oaNotify/deleteAll?ids=" + getIdSelections(), function(data){
-            if(data.success){
-                $('#table').bootstrapTable('refresh');
-                jp.success(data.msg);
-            }else{
-                jp.error(data.msg);
-            }
-        })
-
-    })
-}
-  function edit(){
-	  jp.go("${ctx}/oa/oaNotify/form?id=" + getIdSelections());
-  }
   
 </script>

src/main/webapp/webpage/modules/oa/notify/oaNotifyFormMaterial.jsp

@@ -33,7 +33,7 @@
 		<div class="panel-body">
 		<form:form id="inputForm" modelAttribute="oaNotify" action="${ctx}/oa/oaNotify/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-			<input id="parentId"  type="hidden" readonly="readonly" value="${oaNotify.id}">
+			<input  type="hidden" id="parentId"  readonly="readonly" value="${oaNotify.id}">
 				<div class="form-group">
 					<label class="col-sm-2 control-label"><font color="red">*</font>类型：</label>
 					<div class="col-sm-10">
@@ -58,18 +58,6 @@
 				</button>
 				<table id="table"   data-toolbar="#toolbar"></table>
 			</div>
-				<%--<div class="form-group">--%>
-					<%--<label class="col-sm-2 control-label">附件：</label>--%>
-					<%--<div class="col-sm-10">--%>
-						<%--<c:if test="${oaNotify.status ne '1'}">--%>
-							<%--<sys:fileUpload path="files" value="${oaNotify.files}" type="file" uploadPath="/oa/notify"/>--%>
-						<%--</c:if>--%>
-				         <%--<c:if test="${oaNotify.status eq '1'}">--%>
-							 <%--<sys:fileUpload path="files" value="${oaNotify.files}" type="file" uploadPath="/oa/notify"  readonly="true"/>--%>
-				         <%--</c:if>--%>
-					<%--</div>--%>
-				<%--</div>--%>
-				
 				<c:if test="${oaNotify.status ne '1'}">
 				<div class="form-group">
 					<label class="col-sm-2 control-label"><font color="red">*</font>状态：</label>
@@ -77,14 +65,14 @@
 					<form:radiobuttons path="status" items="${fns:getDictList('oa_notify_status')}" itemLabel="label" itemValue="value" htmlEscape="false" class="i-checks required"/>
 					</div>
 				</div>
-				<div class="form-group">
-					<label class="col-sm-2 control-label"><font color="red">*</font>接受人：</label>
-					<div class="col-sm-10">
-						<sys:userselect roleName="配网工程专职;配网系统专职" id="user" name="userId" value="${construction.tuser.id}" loginName="loginName" loginValue="系统专职"
-										labelName="user.name" labelValue="${construction.tuser.name}"
-										cssClass="form-control required"/>
-					</div>
-				</div>
+				<%--<div class="form-group">--%>
+					<%--<label class="col-sm-2 control-label"><font color="red">*</font>接受人：</label>--%>
+					<%--<div class="col-sm-10">--%>
+						<%--<sys:userselect roleName="配网工程专职;配网系统专职" id="user" name="userId" value="${construction.tuser.id}" loginName="loginName" loginValue="系统专职"--%>
+										<%--labelName="user.name" labelValue="${construction.tuser.name}"--%>
+										<%--cssClass="form-control required"/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
 				</c:if>
 				
 				

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

@@ -15,6 +15,7 @@
                             "taskId": "${construction.act.taskId}",
                             "taskName": "${construction.act.taskName}",
                             "taskDefKey": "${construction.act.taskDefKey}",
+							"projectName":"${construction.projectName}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
                             "flag": "yes",
@@ -52,7 +53,7 @@
 										${fns:unescapeHtml(construction.projectId)}
 								</td>
 								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
-								<td class="width-35">
+								<td class="width-35" id="projectName">
 										${fns:unescapeHtml(construction.projectName)}
 								</td>
 							</tr>
@@ -61,6 +62,9 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
+								<td class="width-15 active"><label class="pull-right"></label></td>
+								<td class="width-35">
+								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>

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

@@ -82,6 +82,9 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
+								<td class="width-15 active"><label class="pull-right"></label></td>
+								<td class="width-35">
+								</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
@@ -303,7 +306,7 @@
 							<div class="col-sm-3"></div>
 							<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="审核通过" />&nbsp;
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
 									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>

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

@@ -303,7 +303,7 @@
 							<div class="col-sm-3"></div>
 							<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="审核通过" />&nbsp;
+									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="通过" />&nbsp;
 									<input id="no" class="btn  btn-danger btn-lg btn-danger" type="submit" value="驳回" />
 								</div>
 							</div>