Browse Source

冲突实体类

yue 5 years ago
parent
commit
8d87c71a7c

+ 6 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/PersonnelManagement.java

@@ -1,9 +1,14 @@
 package com.jeeplus.modules.sg.managementcenter.activiti.entity;
 
 import com.jeeplus.core.persistence.ActEntity;
-
+/**
+ * 流程图权限管理实体类
+ * 发起流程中可见的流程控制,一用户id-多流程图id(用;号)
+ * */
 public class PersonnelManagement extends ActEntity<PersonnelManagement> {
+    //用户id
     private String uId;
+    //流程图id
     private String Pid;
 
     public String getuId() {

+ 1 - 1
src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -142,7 +142,7 @@ public class PickIngController extends BaseController {
         return "modules/sg/picking/activiti/netExamineUpload";
     }
 
-//    constructionLeaderForm.jsp
+//    materialModuleForm.jsp
 
     /**
      * 发起领料页面

+ 35 - 0
src/main/webapp/webpage/modules/sg/materialmodule/activiti/materialModuleForm.js

@@ -0,0 +1,35 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+	/**
+	 * 配网专职提交申请页面
+	 * */
+	$(document).ready(function() {
+		jp.ajaxForm("#inputForm",function(data){
+			if(data.success){
+				jp.alert(data.msg);
+				jp.go("${ctx}"+ data.body.targetUrl);
+			}else{
+				jp.alert(data.msg);
+				$("#inputForm").find("button:submit").button("reset");
+			}
+		});
+
+		$('#acceptDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+
+		$('#examineDate').datetimepicker({
+			format: "YYYY-MM-DD HH:mm:ss"
+		});
+		//富文本初始化
+		$('#reason').summernote({
+			height: 300,
+			lang: 'zh-CN',
+			callbacks: {
+				onChange: function(contents, $editable) {
+					$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+				}
+			}
+		});
+	})
+</script>

+ 70 - 0
src/main/webapp/webpage/modules/sg/materialmodule/activiti/materialModuleForm.jsp

@@ -0,0 +1,70 @@
+<%@ page pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>施工模块申请</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<%@include file="materialModuleForm.js"%>
+</head>
+<body>
+
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+
+					<form:form id="inputForm" modelAttribute="showList" action="${ctx}/picking/activiti/save" method="post" class="form-horizontal">
+						<form:hidden path="id"/>
+						<form:hidden path="act.taskId"/>
+						<form:hidden path="act.taskName"/>
+						<form:hidden path="act.taskDefKey"/>
+						<form:hidden path="act.procInsId"/>
+						<form:hidden path="act.procDefId"/>
+						<form:hidden id="flag" path="act.flag" />
+						<div class="form-group text-center">
+							<h3> 领料申请</h3>
+						</div>
+						<table class="table table-bordered">
+							<tbody>
+							<tr>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称:</label></td>
+								<td class="width-35">
+									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataPicking" id="project" name="projectId" value="${showList.projectName}" labelName="project.requireName" labelValue="${showList.projectName}"
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projecId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="false"></sys:itemselect>
+								</td>
+							</tr>
+							<tr>
+							</tr>
+							</tbody>
+						</table>
+
+						<div class="form-group">
+							<div class="col-lg-3"></div>
+								<div class="col-lg-6">
+									<div class="form-group text-center">
+										<div>
+											<button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>
+										</div>
+									</div>
+								</div>
+						</div>
+					</form:form>
+					<c:if test="${not empty showList.id}">
+						<act:flowChart procInsId="${showList.act.procInsId}"/>
+						<act:histoicFlow procInsId="${showList.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

+ 2 - 1
src/main/webapp/webpage/modules/sg/picking/activiti/pickIng.jsp

@@ -120,4 +120,5 @@
 	</div>
 	</div>
 </body>
-</html>
+</html>
+