工作流结合业务数据

activiti/src/main/resources/template/js/actFlow/actFlowChoose.js

@@ -6,6 +6,7 @@ layui.config({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
+	var index = parent.layer.getFrameIndex(window.name);
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
@@ -24,7 +25,14 @@ layui.config({
 			{ type: 'radio', fixed: 'left', rowspan: '2' },
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' },
 			{ colspan: '4', title: '模型信息', align: 'center'},
-			{ colspan: '2', title: '发布信息', align: 'center'}
+			{ colspan: '2', title: '发布信息', align: 'center'},
+			{ field: 'actModelId', title: '流程配置', align: "center", width: 80, rowspan: '2', templet: function (d) {
+				if (isNull(d.actModelId)) {
+					return "<span class='state-new'>未配置</span>";
+				} else {
+					return "<span class='state-up'>已配置</span>";
+				}
+			}},
 	    ], [
 			{ field: 'flowName', title: '模型名称', width: 150 },
 			{ field: 'modelId', title: '模型ID', width: 100 },
@@ -51,8 +59,8 @@ layui.config({
 			});
 
 			for (var i = 0; i < json.rows.length; i++) {
-				// 未发布的或者已绑定业务数据设置为不可选中
-				if(isNull(res.rows[i].model.deploymentId) || res.rows[i].businessLinkType == 2){
+				// 未发布的或者已做配置的工作流模型设置为不可选中
+				if(isNull(json.rows[i].model.deploymentId) || !isNull(json.rows[i].actModelId)){
 					systemCommonUtil.disabledRow(json.rows[i].LAY_TABLE_INDEX, 'radio');
 				}
 			}
@@ -63,7 +71,7 @@ layui.config({
 					dubClick.find("input[type='radio']").prop("checked", true);
 					form.render();
 					var chooseIndex = JSON.stringify(dubClick.data('index'));
-					var obj = res.rows[chooseIndex];
+					var obj = json.rows[chooseIndex];
 					parent.actFlowMation = obj;
 
 					parent.refreshCode = '0';

activiti/src/main/resources/template/js/actFlow/actFlowList.js

@@ -26,6 +26,13 @@ layui.config({
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' },
 			{ colspan: '4', title: '模型信息', align: 'center'},
 			{ colspan: '2', title: '发布信息', align: 'center'},
+			{ field: 'actModelId', title: '流程配置', align: "center", width: 80, rowspan: '2', templet: function (d) {
+				if (isNull(d.actModelId)) {
+					return "<span class='state-new'>未配置</span>";
+				} else {
+					return "<span class='state-up'>已配置</span>";
+				}
+			}},
 			{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120, rowspan: '2' },
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150, rowspan: '2' },
 			{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120, rowspan: '2' },

activiti/src/main/resources/template/js/actModel/actModelAdd.js

@@ -55,7 +55,8 @@ layui.config({
  	        		pageTypes: data.field.pageTypes,
  	        		tokenUrl: $("#tokenUrl").val(),
  	        		remark: $("#remark").val(),
-					commonUsed: data.field.commonUsed
+					commonUsed: data.field.commonUsed,
+					actFlowId: $("#actFlowId").attr("actFlowId")
  	        	};
 				if (params.pageTypes == 1) {
 					params.addPageUrl = $("#addPageUrl").val();
@@ -79,15 +80,11 @@ layui.config({
 					params.editPageUrl = "";
 					params.revokeMapping = "";
 					params.dsFormId = $("#dsFormId").val();
-					params.actFlowId = $("#actFlowId").attr("actFlowId");
+
 					if (isNull(params.dsFormId)) {
 						winui.window.msg("请选择表单页面", {icon: 2, time: 2000});
 						return false;
 					}
-					if (isNull(params.actFlowId)) {
-						winui.window.msg("请选择工作流模型", {icon: 2, time: 2000});
-						return false;
-					}
 				}
 				// 获取图标信息
 				params = systemCommonUtil.getIconChoose(params);

activiti/src/main/resources/template/js/actModel/actModelEdit.js

@@ -75,7 +75,8 @@ layui.config({
 		 	        		pageTypes: data.field.pageTypes,
 		 	        		tokenUrl: $("#tokenUrl").val(),
 		 	        		remark: $("#remark").val(),
-							commonUsed: data.field.commonUsed
+							commonUsed: data.field.commonUsed,
+							actFlowId: $("#actFlowId").attr("actFlowId")
 		 	        	};
 						if (params.pageTypes == 1) {
 							params.addPageUrl = $("#addPageUrl").val();
@@ -99,15 +100,10 @@ layui.config({
 							params.editPageUrl = "";
 							params.revokeMapping = "";
 							params.dsFormId = $("#dsFormId").val();
-							params.actFlowId = $("#actFlowId").attr("actFlowId");
 							if (isNull(params.dsFormId)) {
 								winui.window.msg("请选择表单页面", {icon: 2, time: 2000});
 								return false;
 							}
-							if (isNull(params.actFlowId)) {
-								winui.window.msg("请选择工作流模型", {icon: 2, time: 2000});
-								return false;
-							}
 						}
 						// 获取图标信息
 						params = systemCommonUtil.getIconChoose(params);

activiti/src/main/resources/template/js/approvalActiviti/startProcessPersonChoose.js

@@ -85,7 +85,8 @@ layui.config({
 
     function getTableParams() {
         return {
-            pageUrl: parent.pageUrl
+            actKey: parent.actKey,
+            businessData: parent.businessData
         };
     }
 

activiti/src/main/resources/template/js/approvalActiviti/startProcessPersonChooseBtn.js

 
-var pageUrl = "";
+var actKey = "";
+var businessData = "";
 
 layui.config({
 	base: basePath, 
@@ -12,7 +13,8 @@ layui.config({
 		var index = parent.layer.getFrameIndex(window.name);
 	    var $ = layui.$;
 
-		pageUrl = parent.activitiUtil.pageUrl;
+		actKey = parent.activitiUtil.actKey;
+		businessData = parent.activitiUtil.businessData;
 
 		$("body").on("click", ".chooseApprovalPersonBtn", function() {
 			_openNewWindows({

activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessAdd.js

@@ -27,7 +27,7 @@ layui.config({
  	
 	form.on('submit(formAddBean)', function (data) {
         if (winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(parent.dsFormId, function (approvalId) {
+			activitiUtil.startProcess(parent.dsFormId, null, function (approvalId) {
 				if(isNull(actKey)){
 					winui.window.msg('流程对象为空，无法启动.', {icon: 2, time: 2000});
 					return false;

activiti/src/main/resources/template/js/dsFormPageSequence/dsFormPageSequenceDraftProcessList.js

@@ -91,7 +91,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm('确认提交进行审批吗？', { icon: 3, title: '提交审批' }, function (i) {
 			layer.close(i);
-			activitiUtil.startProcess(data.pageId, function (approvalId) {
+			activitiUtil.startProcess(data.pageId, null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					pageId: data.pageId,

activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js

@@ -88,7 +88,7 @@ layui.config({
 		processInstanceId = data.processInstanceId;
 		rowId = data.dataId;
 		_openNewWindows({
-			url: data.pageUrl, 
+			url: data.editPageUrl,
 			title: systemLanguage["com.skyeye.editPageTitle"][languageType],
 			pageId: "myactivitiedit",
 			area: ['90vw', '90vh'],

activiti/src/main/resources/template/js/myActiviti/newProcess.js

@@ -61,7 +61,7 @@ layui.config({
         var title = $(this).attr("showTitle");
         var url = $(this).attr("addPageUrl");
         dsFormId = $(this).attr("dsFormId");
-        actKey = $(this).attr("actid");
+        actKey = $(this).attr("serviceClassName");
         _openNewWindows({
             url: url,
             title: title,

activiti/src/main/resources/template/tpl/actFlow/actFlowChoose.html

@@ -9,7 +9,7 @@
 <body>
     <div class="winui-tip alert-info" id="showInfo">
         双击要选择的数据即可选中。
-        <br>选择规则：已发布并且未绑定业务数据的可以选择
+        <br>选择规则：已发布并且未做配置的工作流模型的可以选择
     </div>
     <div class="winui-toolbar">
         <div class="winui-tool">

activiti/src/main/resources/template/tpl/actModel/actModelAdd.html

@@ -15,6 +15,13 @@
 		        	<input type="text" id="typeName" name="typeName" win-verify="required" placeholder="请输入流程名称" class="layui-input"/>
 		        </div>
 		    </div>
+			<div class="layui-form-itemlayui-col-xs12">
+				<label class="layui-form-label">工作流模型<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" id="actFlowId" name="actFlowId" win-verify="required" placeholder="请选择工作流模型" class="layui-input" readonly/>
+					<i class="fa fa-user-plus input-icon" id="actFlowIdSel"></i>
+				</div>
+			</div>
 		    <div class="layui-form-item layui-col-xs12">
 	            <label class="layui-form-label">流程类型<i class="red">*</i></label>
 	            <div class="layui-input-block winui-radio">
@@ -52,13 +59,6 @@
 		            </select>
 	            </div>
 	        </div>
-			<div class="layui-form-item TypeIsTwo layui-hide layui-col-xs12">
-				<label class="layui-form-label">工作流模型<i class="red">*</i></label>
-				<div class="layui-input-block">
-					<input type="text" id="actFlowId" name="actFlowId" placeholder="请选择工作流模型" class="layui-input" readonly/>
-					<i class="fa fa-user-plus input-icon" id="actFlowIdSel"></i>
-				</div>
-			</div>
 
 			<div class="layui-form-item layui-col-xs12" id="iconMation">
 

activiti/src/main/resources/template/tpl/actModel/actModelDetails.html

@@ -21,6 +21,12 @@
 					{{title}}
 				</div>
 			</div>
+			<div class="layui-form-item layui-col-xs12">
+				<label class="layui-form-label">工作流模型：</label>
+				<div class="layui-input-block ver-center">
+					{{actFlowName}}
+				</div>
+			</div>
 			<div class="layui-form-item layui-col-xs12">
 				<label class="layui-form-label">流程类型：</label>
 				<div class="layui-input-block ver-center" id="pageTypes">
@@ -53,12 +59,6 @@
 					{{dsFormName}}
 				</div>
 			</div>
-			<div class="layui-form-item TypeIsTwo layui-hide layui-col-xs12">
-				<label class="layui-form-label">工作流模型：</label>
-				<div class="layui-input-block ver-center">
-					{{actFlowName}}
-				</div>
-			</div>
 
 			<div class="layui-form-item layui-col-xs12">
 				<label class="layui-form-label">图标类型：</label>

activiti/src/main/resources/template/tpl/actModel/actModelEdit.html

@@ -21,6 +21,14 @@
 				<input type="text" id="title" name="title" win-verify="required" placeholder="请输入流程名称" class="layui-input" value="{{title}}"/>
 			</div>
 		</div>
+		<div class="layui-form-item layui-col-xs12">
+			<label class="layui-form-label">工作流模型<i class="red">*</i></label>
+			<div class="layui-input-block">
+				<input type="text" id="actFlowId" name="actFlowId" win-verify="required" placeholder="请选择工作流模型" class="layui-input" readonly
+					   value="{{actFlowName}}" actFlowId="{{actFlowId}}"/>
+				<i class="fa fa-user-plus input-icon" id="actFlowIdSel"></i>
+			</div>
+		</div>
 		<div class="layui-form-item layui-col-xs12">
 			<label class="layui-form-label">流程类型<i class="red">*</i></label>
 			<div class="layui-input-block winui-radio">
@@ -57,15 +65,6 @@
 				</select>
 			</div>
 		</div>
-		<div class="layui-form-item TypeIsTwo layui-hide layui-col-xs12">
-			<label class="layui-form-label">工作流模型<i class="red">*</i></label>
-			<div class="layui-input-block">
-				<input type="text" id="actFlowId" name="actFlowId" placeholder="请选择工作流模型" class="layui-input" readonly
-					   value="{{actFlowName}}" actFlowId="{{actFlowId}}"/>
-				<i class="fa fa-user-plus input-icon" id="actFlowIdSel"></i>
-			</div>
-		</div>
-
 		<div class="layui-form-item layui-col-xs12" id="iconMation">
 
 		</div>

activiti/src/main/resources/template/tpl/myActiviti/newProcess.html

@@ -18,7 +18,7 @@
                 <div class="layui-card-header" style="border-bottom: 1px solid white;">{{title}}</div>
                 <div class="layui-card-body layui-col-md12">
                     {{#each child}}
-                        <div class="task-launch-item launchTask" dsFormId="{{dsFormId}}" actid="{{actId}}" addPageUrl="{{addPageUrl}}" showTitle="{{title}}">
+                        <div class="task-launch-item launchTask" dsFormId="{{dsFormId}}" serviceClassName="{{serviceClassName}}" addPageUrl="{{addPageUrl}}" showTitle="{{title}}">
 							<div class="task-left-top" style="background-color: {{iconBg}};"></div>
 							<div class="task-launch-item-bk task-launch-item-bk_1" style="border-left: 2px solid {{iconBg}};"></div>
 							<div class="task-launch-item-bk task-launch-item-bk_2" style="border-top: 2px solid {{iconBg}};"></div>

admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseAdd.js

@@ -89,7 +89,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetArticlesPurchase"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetArticlesPurchase"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseEdit.js

@@ -107,7 +107,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetArticlesPurchase"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetArticlesPurchase"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js

@@ -112,7 +112,7 @@ layui.config({
 	function caigouSubApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["assetArticlesPurchase"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetArticlesPurchase"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseAdd.js

@@ -91,7 +91,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetArticlesUse"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetArticlesUse"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseEdit.js

@@ -107,7 +107,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetArticlesUse"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetArticlesUse"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js

@@ -112,7 +112,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["assetArticlesUse"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetArticlesUse"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseAdd.js

@@ -89,7 +89,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetManagePurchase"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetManagePurchase"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseEdit.js

@@ -112,7 +112,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetManagePurchase"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetManagePurchase"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseList.js

@@ -137,7 +137,7 @@ layui.config({
 	function caigouSubApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["assetManagePurchase"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetManagePurchase"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnAdd.js

@@ -55,7 +55,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetManageReturn"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetManageReturn"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnEdit.js

@@ -82,7 +82,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetManageReturn"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetManageReturn"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnList.js

@@ -140,7 +140,7 @@ layui.config({
 	function returnSubApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["assetManageReturn"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetManageReturn"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseAdd.js

@@ -55,7 +55,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetManageUse"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetManageUse"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseEdit.js

@@ -75,7 +75,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["assetManageUse"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetManageUse"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js

@@ -140,7 +140,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["assetManageUse"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["assetManageUse"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveAdd.js

@@ -48,7 +48,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["conFerenceRoomReserve"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["conFerenceRoomReserve"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveEdit.js

@@ -55,7 +55,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["conFerenceRoomReserve"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["conFerenceRoomReserve"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveList.js

@@ -106,7 +106,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["conFerenceRoomReserve"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["conFerenceRoomReserve"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowAdd.js

@@ -49,7 +49,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["licenceManageBorrow"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["licenceManageBorrow"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowEdit.js

@@ -66,7 +66,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["licenceManageBorrow"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["licenceManageBorrow"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowList.js

@@ -103,7 +103,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["licenceManageBorrow"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["licenceManageBorrow"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertAdd.js

@@ -48,7 +48,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["licenceManageRevert"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["licenceManageRevert"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertEdit.js

@@ -65,7 +65,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["licenceManageRevert"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["licenceManageRevert"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertList.js

@@ -103,7 +103,7 @@ layui.config({
 	function revertSubApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["licenceManageRevert"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["licenceManageRevert"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowAdd.js

@@ -49,7 +49,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["sealManageBorrow"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["sealManageBorrow"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowEdit.js

@@ -66,7 +66,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["sealManageBorrow"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["sealManageBorrow"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowList.js

@@ -102,7 +102,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["sealManageBorrow"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["sealManageBorrow"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertAdd.js

@@ -53,7 +53,7 @@ layui.config({
 		// 提交审批
 		form.on('submit(formSubBean)', function(data) {
 			if(winui.verifyForm(data.elem)) {
-				activitiUtil.startProcess(sysActivitiModel["sealManageRevert"]["key"], function (approvalId) {
+				activitiUtil.startProcess(sysActivitiModel["sealManageRevert"]["key"], null, function (approvalId) {
 					saveData("2", approvalId);
 				});
 			}

admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertEdit.js

@@ -70,7 +70,7 @@ layui.config({
 		// 提交审批
 		form.on('submit(formSubBean)', function(data) {
 			if(winui.verifyForm(data.elem)) {
-				activitiUtil.startProcess(sysActivitiModel["sealManageRevert"]["key"], function (approvalId) {
+				activitiUtil.startProcess(sysActivitiModel["sealManageRevert"]["key"], null, function (approvalId) {
 					saveData("2", approvalId);
 				});
 			}

admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertList.js

@@ -103,7 +103,7 @@ layui.config({
 	function revertSubApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["sealManageRevert"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["sealManageRevert"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseAdd.js

@@ -83,7 +83,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["vehicleManageUse"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["vehicleManageUse"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseEdit.js

@@ -108,7 +108,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["vehicleManageUse"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["vehicleManageUse"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseList.js

@@ -83,7 +83,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["vehicleManageUse"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["vehicleManageUse"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitAdd.js

@@ -46,7 +46,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossInterviewQuit"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["bossInterviewQuit"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitEdit.js

@@ -54,7 +54,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossInterviewQuit"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["bossInterviewQuit"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js

@@ -113,7 +113,7 @@ layui.config({
     function subApproval(data) {
         layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
             layer.close(index);
-            activitiUtil.startProcess(sysActivitiModel["bossInterviewQuit"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["bossInterviewQuit"]["key"], null, function (approvalId) {
                 var params = {
                     id: data.id,
                     approvalId: approvalId

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAdd.js

@@ -39,7 +39,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossPersonRequire"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["bossPersonRequire"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireEdit.js

@@ -51,7 +51,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossPersonRequire"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["bossPersonRequire"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripAdd.js

@@ -74,7 +74,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkBusinessTrip"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkBusinessTrip"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripEdit.js

@@ -92,7 +92,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkBusinessTrip"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkBusinessTrip"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripList.js

@@ -113,7 +113,7 @@ layui.config({
     function subApproval(data) {
         layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
             layer.close(index);
-            activitiUtil.startProcess(sysActivitiModel["checkWorkBusinessTrip"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkBusinessTrip"]["key"], null, function (approvalId) {
                 var params = {
                     rowId: data.id,
                     approvalId: approvalId

checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveAdd.js

@@ -97,7 +97,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkCancelLeave"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkCancelLeave"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveEdit.js

@@ -114,7 +114,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkCancelLeave"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkCancelLeave"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveList.js

@@ -113,7 +113,7 @@ layui.config({
     function subApproval(data) {
         layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
             layer.close(index);
-            activitiUtil.startProcess(sysActivitiModel["checkWorkCancelLeave"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkCancelLeave"]["key"], null, function (approvalId) {
                 var params = {
                     rowId: data.id,
                     approvalId: approvalId

checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveAdd.js

@@ -125,7 +125,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkLeave"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkLeave"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveEdit.js

@@ -143,7 +143,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkLeave"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkLeave"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveList.js

@@ -113,7 +113,7 @@ layui.config({
     function subApproval(data) {
         layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
             layer.close(index);
-            activitiUtil.startProcess(sysActivitiModel["checkWorkLeave"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkLeave"]["key"], null, function (approvalId) {
                 var params = {
                     rowId: data.id,
                     approvalId: approvalId

checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeAdd.js

@@ -41,7 +41,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkOvertime"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkOvertime"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeEdit.js

@@ -58,7 +58,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkOvertime"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkOvertime"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeList.js

@@ -113,7 +113,7 @@ layui.config({
     function subApproval(data) {
         layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
             layer.close(index);
-            activitiUtil.startProcess(sysActivitiModel["checkWorkOvertime"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["checkWorkOvertime"]["key"], null, function (approvalId) {
                 var params = {
                     rowId: data.id,
                     approvalId: approvalId

crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js

@@ -125,7 +125,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["crmOpportUnity"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["crmOpportUnity"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

crm/src/main/resources/template/js/crmOpportunity/crmopportunityadd.js

@@ -49,7 +49,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["crmOpportUnity"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["crmOpportUnity"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

crm/src/main/resources/template/js/crmOpportunity/crmopportunityedit.js

@@ -155,7 +155,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["crmOpportUnity"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["crmOpportUnity"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

crm/src/main/resources/template/js/crmOpportunity/myCrmOpportunityList.js

@@ -123,7 +123,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["crmOpportUnity"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["crmOpportUnity"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

crm/src/main/resources/template/js/crmcontractmanage/mycrmcontractadd.js

@@ -91,7 +91,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["myCrmContract"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["myCrmContract"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

crm/src/main/resources/template/js/crmcontractmanage/mycrmcontractedit.js

@@ -124,7 +124,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["myCrmContract"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["myCrmContract"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

crm/src/main/resources/template/js/crmcontractmanage/mycrmcontractlist.js

@@ -148,7 +148,7 @@ layui.config({
 	function subApproval(data) {
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["myCrmContract"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["myCrmContract"]["key"], null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

erp/src/main/resources/template/js/otheroutlets/otheroutletsadd.js

@@ -97,7 +97,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsOthers"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outIsOthers"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/otheroutlets/otheroutletsedit.js

@@ -161,7 +161,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsOthers"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outIsOthers"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js

@@ -97,7 +97,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsOthers"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["putIsOthers"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js

@@ -160,7 +160,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsOthers"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["putIsOthers"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js

@@ -91,7 +91,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["purchaseOrder"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["purchaseOrder"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js

@@ -156,7 +156,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["purchaseOrder"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["purchaseOrder"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js

@@ -201,7 +201,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsPurchase"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["putIsPurchase"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/purchaseput/purchaseputadd.js

@@ -118,7 +118,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsPurchase"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["putIsPurchase"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/purchaseput/purchaseputedit.js

@@ -193,7 +193,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsPurchase"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["putIsPurchase"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js

@@ -122,7 +122,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsPurchaseReturns"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outIsPurchaseReturns"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js

@@ -198,7 +198,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsPurchaseReturns"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outIsPurchaseReturns"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/retailoutlet/retailoutletadd.js

@@ -146,7 +146,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsRetail"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outIsRetail"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/retailoutlet/retailoutletedit.js

@@ -213,7 +213,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsRetail"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outIsRetail"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/retailreturns/retailreturnsadd.js

@@ -146,7 +146,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsRetailReturns"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["putIsRetailReturns"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/retailreturns/retailreturnsedit.js

@@ -213,7 +213,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsRetailReturns"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["putIsRetailReturns"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/salesorder/salesorderadd.js

@@ -113,7 +113,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outchaseOrder"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outchaseOrder"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/salesorder/salesorderedit.js

@@ -205,7 +205,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outchaseOrder"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outchaseOrder"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/salesorder/salesorderpurchase.js

@@ -221,7 +221,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsSalesOutlet"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outIsSalesOutlet"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/salesoutlet/salesoutletadd.js

@@ -126,7 +126,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsSalesOutlet"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outIsSalesOutlet"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/salesoutlet/salesoutletedit.js

@@ -214,7 +214,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsSalesOutlet"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["outIsSalesOutlet"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/salesreturns/salesreturnsadd.js

@@ -128,7 +128,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsSalesReturns"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["putIsSalesReturns"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

erp/src/main/resources/template/js/salesreturns/salesreturnsedit.js

@@ -215,7 +215,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsSalesReturns"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["putIsSalesReturns"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

gateway/src/main/resources/template/js/mainPage/mainPage.js

@@ -129,9 +129,9 @@ layui.config({
 	// 流程任务配置点击
 	$("body").on("click", ".act-model-li", function (e) {
 		var title = $(this).attr("showTitle");
-		var url = $(this).attr("pageUrl");
+		var url = $(this).attr("addPageUrl");
 		dsFormId = $(this).attr("dsFormId");
-		actKey = $(this).attr("actid");
+		actKey = $(this).attr("serviceClassName");
 		_openNewWindows({
 			url: url,
 			title: title,

gateway/src/main/resources/template/tpl/mainPage/mainPage.html

@@ -182,7 +182,7 @@
 
 	<script type="text/x-handlebars-template" id="actModelTemplate">
 		{{#each rows}}
-			<li class="layui-col-sm2 act-model-li" dsFormId="{{dsFormId}}" actid="{{actId}}" pageUrl="{{pageUrl}}" showTitle="{{title}}" title="{{title}}">
+			<li class="layui-col-sm2 act-model-li" dsFormId="{{dsFormId}}" serviceClassName="{{serviceClassName}}" addPageUrl="{{addPageUrl}}" showTitle="{{title}}" title="{{title}}">
 				<div class="icon">
 					{{#compare1 iconType iconPic icon iconColor}}{{/compare1}}
 				</div>

ifs/src/main/resources/template/js/income/incomeAdd.js

@@ -46,7 +46,7 @@ layui.config({
     // 走工作流的提交审批
     form.on('submit(formSubOneBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["incomeOrder"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["incomeOrder"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

ifs/src/main/resources/template/js/income/incomeEdit.js

@@ -112,7 +112,7 @@ layui.config({
     // 走工作流的提交审批
     form.on('submit(formSubOneBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["incomeOrder"]["key"], function (approvalId) {
+            activitiUtil.startProcess(sysActivitiModel["incomeOrder"]["key"], null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

ifs/src/main/resources/template/js/income/incomeList.js

@@ -168,7 +168,7 @@ layui.config({
                 subToData(params);
             } else {
                 // 工作流提交
-                activitiUtil.startProcess(sysActivitiModel["incomeOrder"]["key"], function (approvalId) {
+                activitiUtil.startProcess(sysActivitiModel["incomeOrder"]["key"], null, function (approvalId) {
                     var params = {
                         rowId: data.id,
                         approvalId: approvalId

pro/src/main/resources/template/js/procostexpense/procostexpenseadd.js

@@ -78,7 +78,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proCostExpense"]["key"], function (approvalId) {
+			activitiUtil.startProcess(sysActivitiModel["proCostExpense"]["key"], null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}