部分接口请求地址修改

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

@@ -19,7 +19,7 @@ layui.config({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: reqBasePath + 'activitiProcess002',
+        url: flowableBasePath + 'activitiProcess002',
         where: getTableParams(),
         even: true,
         page: false,

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

@@ -18,7 +18,7 @@ layui.config({
 
     showGrid({
         id: "showForm",
-        url: reqBasePath + "actmodletype019",
+        url: flowableBasePath + "actmodletype019",
         params: {},
         pagination: false,
         template: beanTemplate,

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

@@ -24,8 +24,8 @@ layui.config({
 	    id: 'messageMyNeedDealtTable',
 	    elem: '#messageMyNeedDealtTable',
 	    method: 'post',
-	    url: reqBasePath + 'activitimode008',
-	    where: {taskName: $("#taskName").val(), processInstanceId: $("#processInstanceId").val()},
+	    url: flowableBasePath + 'activitimode008',
+	    where: getTableParams(),
 	    even: true,
 	    page: true,
 		limits: getLimits(),
@@ -93,30 +93,36 @@ layui.config({
 			}});
 	}
 	
-    // 刷新我的待办
-	$("body").on("click", "#reloadMyNeedDealtTable", function(){
-		loadMyNeedDealtTable();
-	});
-	
-	// 搜索
-	$("body").on("click", "#formSearch", function(){
-		refreshTable();
-	});
-	
-    function loadMyNeedDealtTable(){
-    	table.reload("messageMyNeedDealtTable", {where:{taskName: $("#taskName").val(), processInstanceId: $("#processInstanceId").val()}});
-    }
-    
-    function refreshTable(){
-    	table.reload("messageMyNeedDealtTable", {page: {curr: 1}, where:{taskName: $("#taskName").val(), processInstanceId: $("#processInstanceId").val()}});
-    }
-    
     $("body").on("click", "#stateDesc", function() {
 		layer.tips('该状态分为挂机和正常，被挂机待办无法进行审批操作', $("#stateDesc"), {
 			tips: [1, '#3595CC'],
 			time: 4000
 		});
 	});
+
+	form.render();
+	form.on('submit(formSearch)', function (data) {
+		if (winui.verifyForm(data.elem)) {
+			table.reload("messageMyNeedDealtTable", {page: {curr: 1}, where: getTableParams()});
+		}
+		return false;
+	});
+
+	// 刷新我的待办
+	$("body").on("click", "#reloadMyNeedDealtTable", function(){
+		loadMyNeedDealtTable();
+	});
+
+	function loadMyNeedDealtTable(){
+		table.reload("messageMyNeedDealtTable", {where: getTableParams()});
+	}
+
+    function getTableParams(){
+    	return {
+    		taskName: $("#taskName").val(),
+			processInstanceId: $("#processInstanceId").val()
+    	};
+	}
     
     exports('pendingProcess', {});
 });

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

@@ -20,7 +20,7 @@
 	                    <input type="text" id="taskName" name="taskName" placeholder="请输入任务名称" class="layui-input" />
 	                </div>
 	                <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-	                <button class="layui-btn list-form-search" type="button" id="formSearch"><language showName="com.skyeye.search2"></language></button>
+					<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
 	            </div>
 	        </div>
 	    </form>