流程设计功能调整

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

@@ -31,16 +31,12 @@ layui.config({
 			var params = {
 				flowName: $("#flowName").val(),
 				modelKey: $("#modelKey").val(),
-				businessLinkType: data.field.businessLinkType
+				businessLinkType: data.field.businessLinkType,
+				serviceClassName: $("#serviceClassName").attr("className")
 			};
 			if (params.businessLinkType == 2) {
-				params.serviceClassName = $("#serviceClassName").attr("className");
 				params.businessKey = $("#businessKey").val();
 				params.businessData = $("#businessData").val();
-				if (isNull(params.serviceClassName)) {
-					winui.window.msg("请选择工作流业务模型", {icon: 2, time: 2000});
-					return false;
-				}
 				if (isNull(params.businessKey)) {
 					winui.window.msg("请输入属性字段", {icon: 2, time: 2000});
 					return false;

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

@@ -36,16 +36,12 @@ layui.config({
 						id: parent.rowId,
 						flowName: $("#flowName").val(),
 						modelKey: $("#modelKey").val(),
-						businessLinkType: json.bean.businessLinkType
+						businessLinkType: json.bean.businessLinkType,
+						serviceClassName: $("#serviceClassName").attr("className")
 					};
 					if (params.businessLinkType == 2) {
-						params.serviceClassName = $("#serviceClassName").attr("className");
 						params.businessKey = $("#businessKey").val();
 						params.businessData = $("#businessData").val();
-						if (isNull(params.serviceClassName)) {
-							winui.window.msg("请选择工作流业务模型", {icon: 2, time: 2000});
-							return false;
-						}
 						if (isNull(params.businessKey)) {
 							winui.window.msg("请输入属性字段", {icon: 2, time: 2000});
 							return false;

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

@@ -24,7 +24,7 @@ layui.config({
 		limit: getLimit(),
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' },
-			{ colspan: '4', title: '模型信息', align: 'center'},
+			{ colspan: '5', title: '模型信息', align: 'center'},
 			{ colspan: '2', title: '发布信息', align: 'center'},
 			{ field: 'actModelId', title: '流程配置', align: "center", width: 80, rowspan: '2', templet: function (d) {
 				if (isNull(d.actModelId)) {
@@ -43,6 +43,7 @@ layui.config({
 			{ field: 'modelId', title: '模型ID', width: 100 },
 			{ field: 'modelKey', title: '模型key', width: 250 },
 			{ field: 'version', title: '版本', width: 80, templet: function (d) {return d.model.version}},
+			{ field: 'serviceName', title: '工作流业务模型', width: 140 },
 			{ field: 'deploymentId', title: '发布状态', align: "center", width: 80, templet: function (d) {
 				if (isNull(d.model.deploymentId)) {
 					return "<span class='state-new'>未发布</span>";

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

@@ -23,20 +23,21 @@
 				</div>
 			</div>
 			<div class="layui-form-item layui-col-xs12">
-				<label class="layui-form-label">绑定业务模型<i class="red">*</i></label>
+				<label class="layui-form-label">工作流业务模型</label>
+				<div class="layui-input-block">
+					<input type="text" id="serviceClassName" name="serviceClassName" placeholder="请选择工作流业务模型" class="layui-input" readonly/>
+					<i class="fa fa-user-plus input-icon" id="serviceClassNameSel"></i>
+					<div class="layui-form-mid layui-word-aux" style="width: 100%;">动态表单类型的工作流可不选择业务模型</div>
+				</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">
 					<input type="radio" name="businessLinkType" value="2" title="是" lay-filter="businessLinkType" checked/>
 					<input type="radio" name="businessLinkType" value="1" title="否" lay-filter="businessLinkType" />
 					<div class="layui-form-mid layui-word-aux" style="width: 100%;">该选项确定后无法更换</div>
 				</div>
 			</div>
-		    <div class="layui-form-item layui-col-xs12 business">
-		    	<label class="layui-form-label">工作流业务模型<i class="red">*</i></label>
-		    	<div class="layui-input-block">
-					<input type="text" id="serviceClassName" name="serviceClassName" placeholder="请选择工作流业务模型" class="layui-input" readonly/>
-					<i class="fa fa-user-plus input-icon" id="serviceClassNameSel"></i>
-		    	</div>
-		    </div>
 		    <div class="layui-form-item layui-col-xs12 business">
 	            <label class="layui-form-label">属性字段<i class="red">*</i></label>
 	            <div class="layui-input-block">

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

@@ -29,17 +29,18 @@
 			</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 ver-center" id="businessLinkType">
-
-			</div>
-		</div>
-		<div class="layui-form-item layui-col-xs12 business">
-			<label class="layui-form-label">工作流业务模型<i class="red">*</i></label>
+			<label class="layui-form-label">工作流业务模型</label>
 			<div class="layui-input-block">
 				<input type="text" id="serviceClassName" name="serviceClassName" placeholder="请选择工作流业务模型" class="layui-input" readonly
 					   value="{{serviceName}}" className="{{serviceClassName}}"/>
 				<i class="fa fa-user-plus input-icon" id="serviceClassNameSel"></i>
+				<div class="layui-form-mid layui-word-aux" style="width: 100%;">动态表单类型的工作流可不选择业务模型</div>
+			</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 ver-center" id="businessLinkType">
+
 			</div>
 		</div>
 		<div class="layui-form-item layui-col-xs12 business">

boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferEdit.js

@@ -11,6 +11,7 @@ layui.config({
         textool = layui.textool,
         form = layui.form,
         dtree = layui.dtree;
+    var serviceClassName = sysServiceMation["bossInterviewJobTransfer"]["key"];
     var selOption = getFileContent('tpl/template/select-option.tpl');
 
     showGrid({
@@ -61,7 +62,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossInterviewJobTransfer"]["key"], function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js

@@ -12,6 +12,7 @@ layui.config({
         form = layui.form,
         laydate = layui.laydate,
         table = layui.table;
+    var serviceClassName = sysServiceMation["bossInterviewJobTransfer"]["key"];
 
     // 新增
     authBtn('1651308552871');
@@ -125,7 +126,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["bossInterviewJobTransfer"]["key"], function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, function (approvalId) {
                 var params = {
                     id: data.id,
                     approvalId: approvalId

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

@@ -10,6 +10,7 @@ layui.config({
         laydate = layui.laydate,
         textool = layui.textool,
         form = layui.form;
+    var serviceClassName = sysServiceMation["bossInterviewQuit"]["key"];
     var selOption = getFileContent('tpl/template/select-option.tpl');
 
     // 离职类型
@@ -46,7 +47,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossInterviewQuit"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -10,6 +10,7 @@ layui.config({
         laydate = layui.laydate,
         textool = layui.textool,
         form = layui.form;
+    var serviceClassName = sysServiceMation["bossInterviewQuit"]["key"];
     var selOption = getFileContent('tpl/template/select-option.tpl');
 
     showGrid({
@@ -54,7 +55,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossInterviewQuit"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -12,6 +12,7 @@ layui.config({
         form = layui.form,
         laydate = layui.laydate,
         table = layui.table;
+    var serviceClassName = sysServiceMation["bossInterviewQuit"]["key"];
 
     // 新增
     authBtn('1650894715778');
@@ -113,7 +114,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"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 var params = {
                     id: data.id,
                     approvalId: approvalId

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerAdd.js

@@ -10,6 +10,7 @@ layui.config({
         laydate = layui.laydate,
         textool = layui.textool,
         form = layui.form;
+    var serviceClassName = sysServiceMation["bossInterviewRegularWorker"]["key"];
 
     // 转正日期
     laydate.render({elem: '#regularTime', type: 'date'});
@@ -45,7 +46,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossInterviewRegularWorker"]["key"], function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerEdit.js

@@ -10,6 +10,7 @@ layui.config({
         laydate = layui.laydate,
         textool = layui.textool,
         form = layui.form;
+    var serviceClassName = sysServiceMation["bossInterviewRegularWorker"]["key"];
 
     showGrid({
         id: "showForm",
@@ -49,7 +50,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossInterviewRegularWorker"]["key"], function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js

@@ -12,6 +12,7 @@ layui.config({
         form = layui.form,
         laydate = layui.laydate,
         table = layui.table;
+    var serviceClassName = sysServiceMation["bossInterviewRegularWorker"]["key"];
 
     // 新增
     authBtn('1650787545029');
@@ -112,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["bossInterviewRegularWorker"]["key"], function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, function (approvalId) {
                 var params = {
                     id: data.id,
                     approvalId: approvalId

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

@@ -9,6 +9,7 @@ layui.config({
     var index = parent.layer.getFrameIndex(window.name);
     var $ = layui.$,
         form = layui.form;
+    var serviceClassName = sysServiceMation["bossPersonRequire"]["key"];
     var selOption = getFileContent('tpl/template/select-option.tpl');
 
     // 获取当前登录员工信息
@@ -39,7 +40,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossPersonRequire"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -9,6 +9,7 @@ layui.config({
     var index = parent.layer.getFrameIndex(window.name);
     var $ = layui.$,
         form = layui.form;
+    var serviceClassName = sysServiceMation["bossPersonRequire"]["key"];
     var selOption = getFileContent('tpl/template/select-option.tpl');
 
     showGrid({
@@ -51,7 +52,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["bossPersonRequire"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -12,6 +12,7 @@ layui.config({
         form = layui.form,
         laydate = layui.laydate,
         table = layui.table;
+    var serviceClassName = sysServiceMation["bossPersonRequire"]["key"];
 
     // 新增
     authBtn('1649569413156');
@@ -117,7 +118,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["assetArticlesPurchase"]["key"], function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, function (approvalId) {
                 var params = {
                     id: data.id,
                     approvalId: approvalId

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

@@ -13,6 +13,7 @@ layui.config({
     var $ = layui.$,
         form = layui.form,
         laydate = layui.laydate;
+    var serviceClassName = sysServiceMation["checkWorkBusinessTrip"]["key"];
     var rowNum = 1; //表格的序号
 
     // 出差日期的初始化集合
@@ -74,7 +75,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkBusinessTrip"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -13,6 +13,7 @@ layui.config({
     var $ = layui.$,
         form = layui.form,
         laydate = layui.laydate;
+    var serviceClassName = sysServiceMation["checkWorkBusinessTrip"]["key"];
     var rowNum = 1; //表格的序号
 
     // 出差日期的初始化集合
@@ -92,7 +93,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkBusinessTrip"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -14,6 +14,7 @@ layui.config({
         form = layui.form,
         laydate = layui.laydate,
         table = layui.table;
+    var serviceClassName = sysServiceMation["checkWorkBusinessTrip"]["key"];
 
     // 新增出差申请
     authBtn('1617804801914');
@@ -113,7 +114,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"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 var params = {
                     rowId: data.id,
                     approvalId: approvalId

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

@@ -13,6 +13,7 @@ layui.config({
     var $ = layui.$,
         form = layui.form,
         laydate = layui.laydate;
+    var serviceClassName = sysServiceMation["checkWorkCancelLeave"]["key"];
     var rowNum = 1; //表格的序号
 
     // 销假日期的初始化集合
@@ -97,7 +98,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkCancelLeave"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -13,6 +13,7 @@ layui.config({
     var $ = layui.$,
         form = layui.form,
         laydate = layui.laydate;
+    var serviceClassName = sysServiceMation["checkWorkCancelLeave"]["key"];
     var rowNum = 1; //表格的序号
 
     // 销假日期的初始化集合
@@ -114,7 +115,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkCancelLeave"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -14,6 +14,7 @@ layui.config({
         form = layui.form,
         laydate = layui.laydate,
         table = layui.table;
+    var serviceClassName = sysServiceMation["checkWorkCancelLeave"]["key"];
 
     // 新增销假申请
     authBtn('1618112042591');
@@ -113,7 +114,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"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 var params = {
                     rowId: data.id,
                     approvalId: approvalId

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

@@ -20,6 +20,7 @@ layui.config({
     var $ = layui.$,
         form = layui.form,
         laydate = layui.laydate;
+    var serviceClassName = sysServiceMation["checkWorkLeave"]["key"];
     var rowNum = 1; //表格的序号
 
     // 请假日期的初始化集合
@@ -125,7 +126,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkLeave"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -20,6 +20,7 @@ layui.config({
     var $ = layui.$,
         form = layui.form,
         laydate = layui.laydate;
+    var serviceClassName = sysServiceMation["checkWorkLeave"]["key"];
     var rowNum = 1; //表格的序号
 
     // 请假日期的初始化集合
@@ -143,7 +144,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkLeave"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -14,6 +14,7 @@ layui.config({
         form = layui.form,
         laydate = layui.laydate,
         table = layui.table;
+    var serviceClassName = sysServiceMation["checkWorkLeave"]["key"];
 
     // 新增请假申请
     authBtn('1616239712898');
@@ -113,7 +114,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"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 var params = {
                     rowId: data.id,
                     approvalId: approvalId

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

@@ -10,6 +10,7 @@ layui.config({
     var $ = layui.$,
         form = layui.form,
         laydate = layui.laydate;
+    var serviceClassName = sysServiceMation["checkWorkOvertime"]["key"];
     var rowNum = 1; //表格的序号
 
     // 加班日期的初始化集合
@@ -58,7 +59,7 @@ layui.config({
     // 提交审批
     form.on('submit(formSubBean)', function(data) {
         if(winui.verifyForm(data.elem)) {
-            activitiUtil.startProcess(sysActivitiModel["checkWorkOvertime"]["key"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 saveData("2", approvalId);
             });
         }

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

@@ -14,6 +14,7 @@ layui.config({
         form = layui.form,
         laydate = layui.laydate,
         table = layui.table;
+    var serviceClassName = sysServiceMation["checkWorkOvertime"]["key"];
 
     // 新增加班申请
     authBtn('1618046226263');
@@ -113,7 +114,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"], null, function (approvalId) {
+            activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
                 var params = {
                     rowId: data.id,
                     approvalId: approvalId

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

@@ -16,9 +16,9 @@ layui.config({
 	var $ = layui.$,
 		laydate = layui.laydate,
 		textool = layui.textool;
-
 	layedit = layui.layedit,
 	form = layui.form;
+	var serviceClassName = sysServiceMation["putIsOthers"]["key"];
 
 	var selOption = getFileContent('tpl/template/select-option.tpl');
 	// 已经选择的商品集合key：表格的行trId，value：商品信息
@@ -32,15 +32,12 @@ layui.config({
 
 	// 初始化账户
 	systemCommonUtil.getSysAccountListByType(function (json) {
-		// 加载账户数据
 		$("#accountId").html(getDataUseHandlebars(selOption, json));
 	});
 
 	// 初始化仓库
 	erpOrderUtil.getDepotList(function (json){
-		// 加载仓库数据
 		$("#depotId").html(getDataUseHandlebars(selOption, json));
-		// 渲染数据到页面
 		initDataToShow();
 	});
 
@@ -160,7 +157,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsOthers"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

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

@@ -17,9 +17,9 @@ layui.config({
 	var $ = layui.$,
 		laydate = layui.laydate,
 		textool = layui.textool;
-
 	layedit = layui.layedit,
 	form = layui.form;
+	var serviceClassName = sysServiceMation["outIsPurchaseReturns"]["key"];
 
 	var inoutitemHtml = "";//支出项目
 
@@ -35,25 +35,21 @@ layui.config({
 
 	// 初始化账户
 	systemCommonUtil.getSysAccountListByType(function (json) {
-		// 加载账户数据
 		$("#accountId").html(getDataUseHandlebars(selOption, json));
 	});
 
 	// 初始化支出项目
 	systemCommonUtil.getSysInoutitemListByType(2, function (json) {
-		// 加载支出项目
 		inoutitemHtml = getDataUseHandlebars(selOption, json);
 	});
 
 	// 初始化仓库
 	erpOrderUtil.getDepotList(function (json){
-		// 加载仓库数据
 		$("#depotId").html(getDataUseHandlebars(selOption, json));
-		// 初始化回显数据
 		initDataShow();
 	});
 
-	//初始化回显数据
+	// 初始化回显数据
 	function initDataShow(){
 		AjaxPostUtil.request({url: flowableBasePath + "purchasereturns003", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function(json) {
 			submitType = json.bean.submitType;
@@ -198,7 +194,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["outIsPurchaseReturns"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

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

@@ -13,9 +13,9 @@ layui.config({
 	var $ = layui.$,
 		laydate = layui.laydate,
 		textool = layui.textool;
-
 	layedit = layui.layedit,
 	form = layui.form;
+	var serviceClassName = sysServiceMation["putIsRetailReturns"]["key"];
 
 	var showTdByEdit = 'rkNum';//根据那一列的值进行变化,默认根据数量
 	var beanTemplate = $("#beanTemplate").html();
@@ -213,7 +213,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsRetailReturns"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

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

@@ -20,9 +20,9 @@ layui.config({
 	var $ = layui.$,
 		laydate = layui.laydate,
 		textool = layui.textool;
-
 	layedit = layui.layedit,
 	form = layui.form;
+	var serviceClassName = sysServiceMation["putIsSalesReturns"]["key"];
 
 	var inoutitemHtml = "";//支出项目
 	var salesManList = new Array();//销售人员
@@ -39,21 +39,17 @@ layui.config({
 
 	// 初始化账户
 	systemCommonUtil.getSysAccountListByType(function (json) {
-		// 加载账户数据
 		$("#accountId").html(getDataUseHandlebars(selOption, json));
 	});
 
 	// 初始化支出项目
 	systemCommonUtil.getSysInoutitemListByType(2, function (json) {
-		// 加载支出项目
 		inoutitemHtml = getDataUseHandlebars(selOption, json);
 	});
 
 	// 初始化仓库
 	erpOrderUtil.getDepotList(function (json){
-		// 加载仓库数据
 		$("#depotId").html(getDataUseHandlebars(selOption, json));
-		// 初始化回显数据
 		initDataShow();
 	});
 
@@ -215,7 +211,7 @@ layui.config({
 	// 走工作流的提交审批
 	form.on('submit(formSubOneBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["putIsSalesReturns"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

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

@@ -11,6 +11,7 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		laydate = layui.laydate;
+	var serviceClassName = sysServiceMation["proCostExpense"]["key"];
 
 	var rowNum = 1; //表格的序号
 	var costTypeList = "";//支出分类集合展示html
@@ -78,7 +79,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proCostExpense"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

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

@@ -11,6 +11,7 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
+	var serviceClassName = sysServiceMation["proCostExpense"]["key"];
 
 	authBtn('1574906688311');
 	
@@ -111,7 +112,7 @@ layui.config({
 	function subApproval(data, obj){
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["proCostExpense"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

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

@@ -11,6 +11,7 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		laydate = layui.laydate;
+	var serviceClassName = sysServiceMation["proCostExpense"]["key"];
 
 	var rowNum = 1; //表格的序号
 	var costTypeList = "";//支出分类集合展示html
@@ -91,7 +92,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proCostExpense"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

pro/src/main/resources/template/js/profile/profileadd.js

@@ -10,6 +10,7 @@ layui.config({
 	var index = parent.layer.getFrameIndex(window.name);
 	var $ = layui.$,
 		form = layui.form;
+	var serviceClassName = sysServiceMation["proFile"]["key"];
 	var selOption = getFileContent('tpl/template/select-option.tpl');
 
 	var ue = ueEditorUtil.initEditor('content');
@@ -37,7 +38,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proFile"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

pro/src/main/resources/template/js/profile/profileedit.js

@@ -10,6 +10,7 @@ layui.config({
 	var index = parent.layer.getFrameIndex(window.name);
 	var $ = layui.$,
 		form = layui.form;
+	var serviceClassName = sysServiceMation["proFile"]["key"];
 	var selOption = getFileContent('tpl/template/select-option.tpl');
 	var ue;
 
@@ -60,7 +61,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proFile"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

pro/src/main/resources/template/js/profile/profilelist.js

@@ -11,6 +11,7 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
+	var serviceClassName = sysServiceMation["proFile"]["key"];
 
 	authBtn('1575277345327');
 	
@@ -108,7 +109,7 @@ layui.config({
 	function subApproval(data, obj){
 		layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
 			layer.close(index);
-			activitiUtil.startProcess(sysActivitiModel["proFile"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

pro/src/main/resources/template/js/proproject/myproprojectlist.js

@@ -10,7 +10,8 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
-	
+	var serviceClassName = sysServiceMation["proProject"]["key"];
+
 	authBtn('1574672416396');//新增
 
 	// 项目分类
@@ -240,7 +241,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["proProject"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				var params = {
 					rowId: data.id,
 					approvalId: approvalId

pro/src/main/resources/template/js/proproject/proprojectadd.js

@@ -12,6 +12,7 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		laydate = layui.laydate;
+	var serviceClassName = sysServiceMation["proProject"]["key"];
 
 	var selOption = getFileContent('tpl/template/select-option.tpl');
 
@@ -101,7 +102,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proProject"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

pro/src/main/resources/template/js/proproject/proprojectedit.js

@@ -12,6 +12,7 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		laydate = layui.laydate;
+	var serviceClassName = sysServiceMation["proProject"]["key"];
 	var ue;
 
 	showGrid({
@@ -127,7 +128,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proProject"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

pro/src/main/resources/template/js/protask/protaskedit.js

@@ -12,6 +12,7 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		laydate = layui.laydate;
+	var serviceClassName = sysServiceMation["proTask"]["key"];
 	var selOption = getFileContent('tpl/template/select-option.tpl');
 
 	var pId = "";//是否是主任务
@@ -126,7 +127,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proTask"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

pro/src/main/resources/template/js/proworkload/proworkloadadd.js

@@ -11,6 +11,7 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		laydate = layui.laydate;
+	var serviceClassName = sysServiceMation["proworkLoad"]["key"];
 
 	var rowNum = 1; //表格的序号
 	var proList = new Array();//项目集合
@@ -151,7 +152,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proworkLoad"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}

pro/src/main/resources/template/js/proworkload/proworkloadedit.js

@@ -11,6 +11,7 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form,
 		laydate = layui.laydate;
+	var serviceClassName = sysServiceMation["proworkLoad"]["key"];
 
 	var rowNum = 1; //表格的序号
 	var proList = new Array();//项目集合
@@ -182,7 +183,7 @@ layui.config({
 	// 提交审批
 	form.on('submit(formSubBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {
-			activitiUtil.startProcess(sysActivitiModel["proworkLoad"]["key"], null, function (approvalId) {
+			activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
 				saveData("2", approvalId);
 			});
 		}