接口信息修改

common/src/main/resources/template/js/sysenclosure/mysysenclosure.js

@@ -25,7 +25,7 @@ layui.config({
 	var ztree = null;
 	fsTree.render({
 		id: "treeDemo",
-		url: "sysenclosure001?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+		url: reqBasePath + "sysenclosure001?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
 		checkEnable: false,
 		loadEnable: true,//异步加载
 		showLine: false,

disk-cloud/src/main/resources/template/js/fileconsole/fileconsolelist.js

@@ -51,7 +51,7 @@ layui.config({
 	var ztree = null;
 	fsTree.render({
 		id: "treeDemo",
-		url: "fileconsole001?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+		url: reqBasePath + "fileconsole001?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
 		checkEnable: false,
 		loadEnable: true,//异步加载
 		showLine: false,

disk-cloud/src/main/resources/template/js/shareFile/fileFolder.js

@@ -16,7 +16,7 @@ layui.config({
 		var ztree = null;
 		fsTree.render({
 			id: "treeDemo",
-			url: "fileconsole001?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+			url: reqBasePath + "fileconsole001?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
 			checkEnable: true,
 			loadEnable: true,//异步加载
 			showLine: false,

dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationChooseByFirstTypeCode.js

@@ -19,7 +19,7 @@ layui.config({
     var ztree = null;
     fsTree.render({
         id: "treeDemo",
-        url: "dsFormObjectRelation007?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"] + "&firstTypeCode=" + firstTypeCode + "&language=" + languageType,
+        url: flowableBasePath + "dsFormObjectRelation007?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"] + "&firstTypeCode=" + firstTypeCode + "&language=" + languageType,
         clickCallback: onClickTree,
         onDblClick: onClickTree
     }, function(id){

erp-produce/src/main/resources/template/js/erpDepartStock/erpDepartStockList.js

@@ -84,7 +84,7 @@ layui.config({
 		var el5;
 		el5 = eleTree.render({
             elem: '.ele5',
-            url: "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
+            url: flowableBasePath + "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
             defaultExpandAll: true,
             expandOnClickNode: false,
             highlightCurrent: true

erp/src/main/resources/template/js/allocation/allocationlist.js

@@ -179,7 +179,7 @@ layui.config({
     function getTableParams(){
         // 单据的开始时间、结束时间
         var startTime = "", endTime = "";
-    	if(!isNull($("#operTime").val())){//一定要记得，当createTime为空时
+    	if(!isNull($("#operTime").val())){
             startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00';
             endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59';
     	}

erp/src/main/resources/template/js/assemblysheet/assemblysheetlist.js

@@ -153,7 +153,7 @@ layui.config({
     // 导出excel
     $("body").on("click", "#downloadExcel", function () {
     	postDownLoadFile({
-			url : reqBasePath + 'assemblysheet005?userToken=' + getCookie('userToken') + '&loginPCIp=' + returnCitySN["cip"],
+			url : flowableBasePath + 'assemblysheet005?userToken=' + getCookie('userToken') + '&loginPCIp=' + returnCitySN["cip"],
 			params: getTableParams(),
 			method : 'post'
 		});

erp/src/main/resources/template/js/erpcommon/erpOrderFlowLine.js

@@ -14,7 +14,7 @@ layui.config({
 	var orderId = GetUrlParam("rowId");
 	var type = GetUrlParam("type");
 	// 加载订单流水线信息
-	AjaxPostUtil.request({url: reqBasePath + "erpcommon002", params: {rowId: orderId, type: type}, type: 'json', method: 'GET', callback: function(data) {
+	AjaxPostUtil.request({url: flowableBasePath + "erpcommon002", params: {rowId: orderId, type: type}, type: 'json', method: 'GET', callback: function(data) {
 		if(data.returnCode == 0) {
 			var newData = dealWithData(data.bean);
 			$('#chart-container').orgchart({

erp/src/main/resources/template/js/material/materialChoose.js

@@ -38,7 +38,7 @@ layui.config({
     var materialCategoryType;
     fsTree.render({
 		id: "materialCategoryType",
-		url: "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
+		url: flowableBasePath + "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
 		checkEnable: false,
 		loadEnable: false,//异步加载
 		showLine: false,
@@ -104,7 +104,7 @@ layui.config({
 		    id: 'messageTable',
 		    elem: '#messageTable',
 		    method: 'post',
-		    url: reqBasePath + 'material010',
+		    url: flowableBasePath + 'material010',
 		    where: getTableParams(),
 			even: true,
 		    page: true,
@@ -180,13 +180,13 @@ layui.config({
 		var selectedData = tableCheckBoxUtil.getValue({
 			gridId: 'messageTable'
 		});
-		AjaxPostUtil.request({url:reqBasePath + "material013", params: {ids: selectedData.toString()}, type:'json', callback:function(json){
+		AjaxPostUtil.request({url: flowableBasePath + "material013", params: {ids: selectedData.toString()}, type: 'json', callback: function(json){
    			if(json.returnCode == 0){
    				parent.productMationList = [].concat(json.rows);
  	   			parent.layer.close(index);
  	        	parent.refreshCode = '0';
    			}else{
-   				winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+   				winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
    			}
    		}});
 	});

erp/src/main/resources/template/js/material/materialChooseToProduce.js

@@ -6,10 +6,8 @@ layui.config({
 }).extend({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form', 'tableCheckBoxUtil', 'fsCommon', 'fsTree'], function (exports) {
-	
 	winui.renderColor();
 	var index = parent.layer.getFrameIndex(window.name);
-	
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table,
@@ -29,7 +27,7 @@ layui.config({
     var materialCategoryType;
     fsTree.render({
 		id: "materialCategoryType",
-		url: "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
+		url: flowableBasePath + "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
 		checkEnable: false,
 		loadEnable: false,//异步加载
 		showLine: false,
@@ -167,7 +165,7 @@ layui.config({
 			winui.window.msg("请选择商品", {icon: 2,time: 2000});
 			return false;
 		}
-		AjaxPostUtil.request({url:reqBasePath + "material014", params: {ids: selectedData.toString()}, type:'json', callback:function(json){
+		AjaxPostUtil.request({url: flowableBasePath + "material014", params: {ids: selectedData.toString()}, type: 'json', callback: function(json){
    			if(json.returnCode == 0){
    				productMationList = json.rows;
    				$step.nextStep();
@@ -180,7 +178,7 @@ layui.config({
 				});
    				form.render();
    			}else{
-   				winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+   				winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
    			}
    		}});
 	});

erp/src/main/resources/template/js/material/materialInventoryWarningList.js

@@ -84,7 +84,7 @@ layui.config({
 		var el5;
 		el5 = eleTree.render({
             elem: '.ele5',
-            url: "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
+            url: flowableBasePath + "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
             defaultExpandAll: true,
             expandOnClickNode: false,
             highlightCurrent: true

erp/src/main/resources/template/js/material/materialReserveList.js

@@ -94,7 +94,7 @@ layui.config({
 		var el5;
 		el5 = eleTree.render({
             elem: '.ele5',
-            url: "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
+            url: flowableBasePath + "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
             defaultExpandAll: true,
             expandOnClickNode: false,
             highlightCurrent: true

erp/src/main/resources/template/js/material/materialadd.js

@@ -52,7 +52,7 @@ layui.config({
 	    var materialCategoryType;
 	    fsTree.render({
 			id: "materialCategoryType",
-			url: "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
+			url: flowableBasePath + "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
 			checkEnable: true,
 			loadEnable: false,//异步加载
 			chkStyle: "radio",
@@ -70,7 +70,7 @@ layui.config({
 		function initManyUnitSelect(){
 			showGrid({
 			 	id: "unitGroupId",
-			 	url: reqBasePath + "materialunit006",
+			 	url: flowableBasePath + "materialunit006",
 			 	params: {},
 			 	pagination: false,
 			 	template: selTemplate,
@@ -207,12 +207,12 @@ layui.config({
  	        	params.extendData = JSON.stringify(extendData);
  	        	//工序信息
  	        	params.procedureJsonStr = JSON.stringify(procedureMationList);
- 	        	AjaxPostUtil.request({url:reqBasePath + "material003", params: params, type:'json', callback:function(json){
+ 	        	AjaxPostUtil.request({url: flowableBasePath + "material003", params: params, type: 'json', callback: function(json){
  	        		if(json.returnCode == 0){
  	        			parent.layer.close(index);
  	        			parent.refreshCode = '0';
  	        		}else{
- 	        			winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+ 	        			winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
  	        		}
  	        	}});
  	        }

erp/src/main/resources/template/js/material/materialedit.js

@@ -96,7 +96,7 @@ layui.config({
 		 		
 		 		fsTree.render({
 					id: "materialCategoryType",
-					url: "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
+					url: flowableBasePath + "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
 					checkEnable: true,
 					loadEnable: false,//异步加载
 					chkStyle: "radio",

erp/src/main/resources/template/js/material/materiallist.js

@@ -74,7 +74,7 @@ layui.config({
 		var el5;
 		el5 = eleTree.render({
             elem: '.ele5',
-            url: "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
+            url: flowableBasePath + "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
             defaultExpandAll: true,
             expandOnClickNode: false,
             highlightCurrent: true

erp/src/main/resources/template/js/materialCategory/materialCategoryAdd.js

@@ -24,7 +24,7 @@ layui.config({
 		//加载树信息
 	    fsTree.render({
 			id: "materialCategoryType",
-			url: "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
+			url: flowableBasePath + "materialcategory008?userToken=" + getCookie('userToken') + "&loginPCIp=",
 			checkEnable: true,
 			loadEnable: false,//异步加载
 			chkStyle: "radio",
@@ -50,7 +50,7 @@ layui.config({
  	        		remark: $("#remark").val(),
  	        		parentId: checkNodes[0].id
  	        	};
- 	        	AjaxPostUtil.request({url: reqBasePath + "materialcategory002", params: params, type: 'json', method: "POST", callback: function(json){
+ 	        	AjaxPostUtil.request({url: flowableBasePath + "materialcategory002", params: params, type: 'json', method: "POST", callback: function(json){
  	        		if(json.returnCode == 0){
  	        			parent.layer.close(index);
  	        			parent.refreshCode = '0';

erp/src/main/resources/template/js/materialCategory/materialCategoryEdit.js

@@ -13,7 +13,7 @@ layui.config({
 	    
 	    showGrid({
 		 	id: "showForm",
-		 	url: reqBasePath + "materialcategory004",
+		 	url: flowableBasePath + "materialcategory004",
 		 	params: {rowId: parent.rowId},
 		 	pagination: false,
 			method: "GET",
@@ -35,7 +35,7 @@ layui.config({
 		 	        		name: $("#typeName").val(),
 		 	        		remark: $("#remark").val()
 		 	        	};
-		 	        	AjaxPostUtil.request({url: reqBasePath + "materialcategory005", params: params, type: 'json', method: "PUT", callback: function(json){
+		 	        	AjaxPostUtil.request({url: flowableBasePath + "materialcategory005", params: params, type: 'json', method: "PUT", callback: function(json){
 		 	        		if(json.returnCode == 0){
 		 	        			parent.layer.close(index);
 		 	        			parent.refreshCode = '0';

erp/src/main/resources/template/js/materialCategory/materialCategoryList.js

@@ -18,7 +18,7 @@ layui.config({
 	    elem: '#messageTable',
 	    method: 'post',
 	    idField: 'id',
-	    url: reqBasePath + 'materialcategory001',
+	    url: flowableBasePath + 'materialcategory001',
 	    cellMinWidth: 100,
 	    where: getTableParams(),
 	    treeId: 'id',//树形id字段名称
@@ -72,7 +72,7 @@ layui.config({
 	function delet(data){
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
-            AjaxPostUtil.request({url: reqBasePath + "materialcategory003", params: {rowId: data.id}, type: 'json', method: "DELETE", callback: function(json){
+            AjaxPostUtil.request({url: flowableBasePath + "materialcategory003", params: {rowId: data.id}, type: 'json', method: "DELETE", callback: function(json){
     			if(json.returnCode == 0){
     				winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
     				loadTable();
@@ -104,7 +104,7 @@ layui.config({
 	
 	// 上移
 	function upMove(data){
-        AjaxPostUtil.request({url: reqBasePath + "materialcategory006", params: {rowId: data.id}, type: 'json', method: "PUT", callback: function(json){
+        AjaxPostUtil.request({url: flowableBasePath + "materialcategory006", params: {rowId: data.id}, type: 'json', method: "PUT", callback: function(json){
 			if(json.returnCode == 0){
 				winui.window.msg(systemLanguage["com.skyeye.moveUpOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
 				loadTable();
@@ -116,7 +116,7 @@ layui.config({
 	
 	// 下移
 	function downMove(data){
-        AjaxPostUtil.request({url: reqBasePath + "materialcategory007", params: {rowId: data.id}, type: 'json', method: "PUT", callback: function(json){
+        AjaxPostUtil.request({url: flowableBasePath + "materialcategory007", params: {rowId: data.id}, type: 'json', method: "PUT", callback: function(json){
 			if(json.returnCode == 0){
 				winui.window.msg(systemLanguage["com.skyeye.moveDownOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
 				loadTable();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

erp/src/main/resources/template/js/salesOrderOverPlan/salesOrderOverPlan.js

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

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

@@ -17,7 +17,7 @@ layui.config({
     var materialCategoryType;
     fsTree.render({
 		id: "materialCategoryType",
-		url: "salesorder011?userToken=" + getCookie('userToken') + "&loginPCIp=",
+		url: flowableBasePath + "salesorder011?userToken=" + getCookie('userToken') + "&loginPCIp=",
 		checkEnable: false,
 		loadEnable: false,//异步加载
 		showLine: false,

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

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

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

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

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

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

erp/src/main/resources/template/js/splitlist/splitlistdetails.js

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

erp/src/main/resources/template/js/splitlist/splitlistlist.js

 
 var rowId = "";
 
-//单据的开始时间、结束时间
-var startTime = "", endTime = "";
-
 layui.config({
     base: basePath,
     version: skyeyeVersion
@@ -27,8 +24,8 @@ layui.config({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: reqBasePath + 'splitlist001',
-        where: {defaultNumber: $("#defaultNumber").val(), material: $("#material").val(), startTime: startTime, endTime: endTime},
+        url: flowableBasePath + 'splitlist001',
+        where: getTableParams(),
         even: true,
         page: true,
         limits: getLimits(),
@@ -78,23 +75,15 @@ layui.config({
         }
     });
 
-    form.render();
-    form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-            loadTable();
-        }
-        return false;
-    });
-
-    //删除
+    // 删除
     function deletemember(data){
         layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
-            AjaxPostUtil.request({url:reqBasePath + "delcommon009", params: {rowId: data.id}, type:'json', callback:function(json){
+            AjaxPostUtil.request({url: flowableBasePath + "delcommon009", params: {rowId: data.id}, type: 'json', callback: function(json){
                 if(json.returnCode == 0){
-                    winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1,time: 2000});
+                    winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
                     loadTable();
                 }else{
-                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                    winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
                 }
             }});
         });
@@ -103,12 +92,12 @@ layui.config({
     //提交审批
 	function subExamine(data){
         layer.confirm('确认要提交审核吗？', { icon: 3, title: '提交审核操作' }, function (index) {
-            AjaxPostUtil.request({url:reqBasePath + "splitlist006", params: {rowId: data.id}, type:'json', callback:function(json){
+            AjaxPostUtil.request({url: flowableBasePath + "splitlist006", params: {rowId: data.id}, type: 'json', callback: function(json){
                 if(json.returnCode == 0){
-                    winui.window.msg("提交成功。", {icon: 1,time: 2000});
+                    winui.window.msg("提交成功。", {icon: 1, time: 2000});
                     loadTable();
                 }else{
-                    winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+                    winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
                 }
             }});
         });
@@ -161,40 +150,39 @@ layui.config({
             }});
     });
 
+    // 导出excel
+    $("body").on("click", "#downloadExcel", function () {
+    	postDownLoadFile({
+			url : flowableBasePath + 'splitlist005?userToken=' + getCookie('userToken') + '&loginPCIp=' + returnCitySN["cip"],
+			params: getTableParams(),
+			method : 'post'
+		});
+    });
+
+    form.render();
+    form.on('submit(formSearch)', function (data) {
+        if (winui.verifyForm(data.elem)) {
+            table.reload("messageTable", {page: {curr: 1}, where: getTableParams()})
+        }
+        return false;
+    });
+
     $("body").on("click", "#reloadTable", function() {
         loadTable();
     });
 
-    $("body").on("click", "#formSearch", function () {
-        refreshTable();
-    });
-    
-    //刷新
+    // 刷新
     function loadTable(){
         table.reload("messageTable", {where: getTableParams()});
     }
-
-    //搜索
-    function refreshTable(){
-        table.reload("messageTable", {page: {curr: 1}, where: getTableParams()})
-    }
-    
-    //导出excel
-    $("body").on("click", "#downloadExcel", function () {
-    	postDownLoadFile({
-			url : reqBasePath + 'splitlist005?userToken=' + getCookie('userToken') + '&loginPCIp=' + returnCitySN["cip"],
-			params: getTableParams(),
-			method : 'post'
-		});
-    });
     
     function getTableParams(){
-    	if(isNull($("#operTime").val())){//一定要记得，当createTime为空时
+        var startTime = "", endTime = "";
+    	if(!isNull($("#operTime").val())){
     		startTime = "";
     		endTime = "";
-    	}else {
-    		startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00';
-    		endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59';
+            startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00';
+            endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59';
     	}
     	return {
     		defaultNumber: $("#defaultNumber").val(),

erp/src/main/resources/template/js/storeHouseInventory/storeHouseInventoryList.js

@@ -137,7 +137,7 @@ layui.config({
 		var el5;
 		el5 = eleTree.render({
             elem: '.ele5',
-            url: "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
+            url: flowableBasePath + "materialcategory009?userToken=" + getCookie('userToken') + "&loginPCIp=",
             defaultExpandAll: true,
             expandOnClickNode: false,
             highlightCurrent: true

erp/src/main/resources/template/tpl/material/materialChooseToProduce.html

@@ -67,7 +67,7 @@
 	            </div>
 	            <div class="layui-inline" style="width: 100%">
 	            	<ul id="materialCategoryType" class="ztree fsTree" method="get" isRoot="1"
-	 							treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name" style="overflow-y: auto; height: 100%;"></ul>
+						treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name" style="overflow-y: auto; height: 100%;"></ul>
 	            </div>
 	    	</div>
 	    	<div style="width: calc(100% - 200px); float: left;">

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

@@ -75,7 +75,7 @@ layui.config({
 	function initHotActModel(){
 		showGrid({
 			id: "actModelShow",
-			url: reqBasePath + "actmodletype022",
+			url: flowableBasePath + "actmodletype022",
 			params: {},
 			pagination: false,
 			template: $("#actModelTemplate").html(),

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

@@ -90,7 +90,7 @@ layui.config({
     var ztree = null;
     fsTree.render({
         id: "treeDemo",
-        url: "dsFormObjectRelation007?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"] + "&firstTypeCode=IFS" + "&language=" + languageType,
+        url: flowableBasePath + "dsFormObjectRelation007?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"] + "&firstTypeCode=IFS" + "&language=" + languageType,
         clickCallback: onClickTree,
         onDblClick: onClickTree
     }, function(id){

knowlg/src/main/resources/template/js/knowledgetype/knowledgetypeadd.js

@@ -15,7 +15,7 @@ layui.config({
 	    var parentType;
 		fsTree.render({
 			id: "parentType",
-			url: "knowledgetype001?userToken=" + getCookie('userToken') + "&loginPCIp=",
+			url: reqBasePath + "knowledgetype001?userToken=" + getCookie('userToken') + "&loginPCIp=",
 			checkEnable: true,
 			loadEnable: false,//异步加载
 			chkStyle: "radio",

note/src/main/resources/template/js/index/myNote.js

@@ -36,7 +36,7 @@ layui.config({
 	var ztree = null;
 	fsTree.render({
 		id: "treeDemo",
-		url: "mynote001?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+		url: reqBasePath + "mynote001?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
 		checkEnable: false,
 		dragEnable: true,
 		loadEnable: true,//异步加载

note/src/main/resources/template/js/note/noteFileTree.js

@@ -20,7 +20,7 @@ layui.config({
 	var ztree = null;
 	fsTree.render({
 		id: "treeDemo",
-		url: "mynote012?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"]+ "&moveId=" + clickId,
+		url: reqBasePath + "mynote012?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"]+ "&moveId=" + clickId,
 		checkEnable: true,
 		chkStyle: "radio",
 		loadEnable: true,//异步加载

planpro/src/main/resources/template/js/flowChart/makeFlowChart.js

@@ -40,7 +40,7 @@ layui.config({
     function initTree(){
 		fsTree.render({
 			id: "treeDemo",
-			url: 'planprojectflow001?projectId=' + parent.rowId + "&userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+			url: reqBasePath + 'planprojectflow001?projectId=' + parent.rowId + "&userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
 			loadEnable: false,
 			clickCallback: onClickTree,
 			onDblClick: onClickTree,

userauth/src/main/resources/template/js/sysevemenu/sysevemenulist.js

@@ -157,7 +157,7 @@ layui.config({
 			var tree = fsTree.render({
 				id: treeId,
 				funcNo: funcNo,
-				url: url + "?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+				url: reqBasePath + url + "?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
 				clickCallback: onClickTree,
 				onDblClick: onClickTree,
 				getTree: getTree

userauth/src/main/resources/template/js/syseverole/sysEveRolePCMenu.js

@@ -60,7 +60,7 @@ layui.config({
 					var tree = fsTree.render({
 						id: treeId,
 						funcNo: funcNo,
-						url: url + "?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+						url: reqBasePath + url + "?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
 						getTree: getTree,
 						checkEnable: true,
 						loadEnable: false,

userauth/src/main/resources/template/js/syseverole/syseveroleappmenu.js

@@ -80,7 +80,7 @@ layui.config({
    						var tree = fsTree.render({
    							id: treeId,
    							funcNo: funcNo,
-   							url: url + "?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+   							url: reqBasePath + url + "?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
    							getTree: getTree,
    							checkEnable: true,
    							loadEnable: false,

web/src/main/resources/template/assets/lib/layui/custom.js

@@ -246,7 +246,7 @@ function auth(urlNum){
 			while (win != win.top){
 				win = win.top;
 			}
-			win.location.href = reqBasePath + "/tpl/index/login.html";
+			win.location.href = "../../tpl/index/login.html";
 		});
 	}
 	return false;

web/src/main/resources/template/assets/lib/layui/customer/erpOrderUtil.js

@@ -57,7 +57,7 @@ var erpOrderUtil = {
     getSubmitTypeByOrderType: function (orderType){
         // 1需要审核；2不需要审核
         var submitType = "";
-        AjaxPostUtil.request({url: reqBasePath + "erpcommon004", params: {orderType: orderType}, method: "GET", type: 'json', callback: function(json) {
+        AjaxPostUtil.request({url: flowableBasePath + "erpcommon004", params: {orderType: orderType}, method: "GET", type: 'json', callback: function(json) {
             if(json.returnCode == 0) {
                 submitType = json.bean.needExamine;
             } else {
@@ -105,7 +105,7 @@ var erpOrderUtil = {
      */
     deleteOrderMation: function (id, orderType, callback){
         layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
-            AjaxPostUtil.request({url: reqBasePath + "erpcommon005", params: {rowId: id, orderType: orderType}, method: "DELETE", type: 'json', callback: function(json) {
+            AjaxPostUtil.request({url: flowableBasePath + "erpcommon005", params: {rowId: id, orderType: orderType}, method: "DELETE", type: 'json', callback: function(json) {
                 if(json.returnCode == 0) {
                     winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1,time: 2000});
                     if(typeof(callback) == "function") {
@@ -144,7 +144,7 @@ var erpOrderUtil = {
             orderType: orderType,
             approvalId: approvalId
         };
-        AjaxPostUtil.request({url: reqBasePath + "erpcommon006", params: params, method: "PUT", type: 'json', callback: function(json) {
+        AjaxPostUtil.request({url: flowableBasePath + "erpcommon006", params: params, method: "PUT", type: 'json', callback: function(json) {
             if(json.returnCode == 0) {
                 winui.window.msg("提交成功。", {icon: 1,time: 2000});
                 if(typeof(callback) == "function") {
@@ -164,7 +164,11 @@ var erpOrderUtil = {
      */
     revokeOrderMation: function (processInstanceId, orderType, callback){
         layer.confirm('确认要撤销吗？', { icon: 3, title: '撤销操作' }, function (index) {
-            AjaxPostUtil.request({url: reqBasePath + "erpcommon003", params: {processInstanceId: processInstanceId, orderType: orderType}, method: "GET", type: 'json', callback: function(json) {
+            var params = {
+                processInstanceId: processInstanceId,
+                orderType: orderType
+            };
+            AjaxPostUtil.request({url: flowableBasePath + "erpcommon003", params: params, method: "GET", type: 'json', callback: function(json) {
                 if(json.returnCode == 0) {
                     winui.window.msg("撤销成功。", {icon: 1,time: 2000});
                     if(typeof(callback) == "function") {
@@ -207,7 +211,7 @@ var erpOrderUtil = {
      * @param callback 回执函数
      */
     getDepotList: function (callback){
-        AjaxPostUtil.request({url: reqBasePath + "storehouse008", params: {}, type: 'json', method: "GET", callback: function(json) {
+        AjaxPostUtil.request({url: flowableBasePath + "storehouse008", params: {}, type: 'json', method: "GET", callback: function(json) {
             if(json.returnCode == 0) {
                 if(typeof(callback) == "function") {
                     callback(json);

web/src/main/resources/template/assets/lib/layui/customer/showGrid.js

@@ -427,7 +427,7 @@ dataGrid.prototype = {
                             win = win.top;
                         }
                         result = eval('(' + '{"returnMessage":"登录超时。","returnCode":-9999,"total":0,"rows":"","bean":""}' + ')');
-                        win.location.href = reqBasePath + "/tpl/index/login.html";//XMLHttpRequest.getResponseHeader("CONTEXTPATH");
+                        win.location.href = "../../tpl/index/login.html";//XMLHttpRequest.getResponseHeader("CONTEXTPATH");
                     }else if(sessionstatus == "NOAUTHPOINT"){
                         result = eval('(' + '{"returnMessage":"您不具备该权限。","returnCode":-9999,"total":0,"rows":"","bean":""}' + ')');
                     }

web/src/main/resources/template/assets/lib/layui/lay/modules/dtree/dtree.js

@@ -161,7 +161,7 @@ layui.define(['jquery','layer','element','form'], function(exports) {
 							while (win != win.top){
 								win = win.top;
 							}
-							win.location.href = reqBasePath + "/tpl/index/login.html";//XMLHttpRequest.getResponseHeader("CONTEXTPATH");  
+							win.location.href = "../../tpl/index/login.html";//XMLHttpRequest.getResponseHeader("CONTEXTPATH");
 						}else if(sessionstatus == "NOAUTHPOINT"){
 							layer.msg('您不具备该权限。',{icon:5, shift:6});
 						}

web/src/main/resources/template/assets/lib/layui/lay/modules/table-old.js

@@ -392,7 +392,7 @@ layui.define(["laytpl", "laypage", "layer", "form", "util"], function(e) {
                                 while(win != win.top) {
                                     win = win.top;
                                 }
-                                win.location.href = reqBasePath + "/tpl/index/login.html"; //XMLHttpRequest.getResponseHeader("CONTEXTPATH");
+                                win.location.href = "../../tpl/index/login.html"; //XMLHttpRequest.getResponseHeader("CONTEXTPATH");
                             } else if(sessionstatus == "NOAUTHPOINT") {
                                 i.layMain.html('<div class="' + f + '">' + systemLanguage["com.skyeye.permission"][languageType] + '</div>'),
                                     i.renderForm(),

web/src/main/resources/template/assets/lib/layui/lay/modules/treetable/treeGrid.js

@@ -1523,7 +1523,7 @@ layui.config({}).extend({}).define(['laytpl', 'laypage', 'layer', 'form'], funct
 						while(win != win.top) {
 							win = win.top;
 						}
-						win.location.href = reqBasePath + "/tpl/index/login.html"; //XMLHttpRequest.getResponseHeader("CONTEXTPATH");  
+						win.location.href = "../../tpl/index/login.html"; //XMLHttpRequest.getResponseHeader("CONTEXTPATH");
 					} else if(sessionstatus == "NOAUTHPOINT") {
 						that.layMain.html('<div class="' + NONE + '">您不具备该权限。</div>');
 						that.renderForm();

web/src/main/resources/template/assets/lib/layui/lay/modules/ztree/js/fsCommon.js

@@ -34,9 +34,6 @@ layui.define(['layer', 'form', 'fsButtonCommon'], function(exports) {
 			fsCommon.invoke(url, param, callBackFunc, async, method);
 		},
 		invoke: function(url, param, callBackFunc, async, method) {
-			if(!isNull(reqBasePath)) {
-				url = reqBasePath + url;
-			}
 			if(isNull(async)) {
 				async = true;
 			}
@@ -69,7 +66,7 @@ layui.define(['layer', 'form', 'fsButtonCommon'], function(exports) {
 							while (win != win.top){
 								win = win.top;
 							}
-							win.location.href = reqBasePath + "/tpl/index/login.html";//XMLHttpRequest.getResponseHeader("CONTEXTPATH");  
+							win.location.href = "../../tpl/index/login.html";//XMLHttpRequest.getResponseHeader("CONTEXTPATH");
 						}else if(sessionstatus == "NOAUTHPOINT"){
 							fsCommon.errorMsg('您不具备该权限。');
 						}

web/src/main/resources/template/assets/lib/layui/lay/modules/ztree/js/fsTree.js

@@ -134,13 +134,6 @@ layui.define(['layer', "fsCommon"], function(exports) {
 			fsCommon.warnMsg("功能号或请求地址为空!");
 			return;
 		}
-		if (isNull(url)) {
-			url = "/fsbus/" + funcNo;
-		}
-		var servletUrl = reqBasePath;
-		if (!isNull(servletUrl)) {
-			url = servletUrl + url;
-		}
 		if (isNull(_this.config.chkboxType)) {
 			_this.config.chkboxType = {
 				"Y" : "ps",
@@ -171,7 +164,7 @@ layui.define(['layer', "fsCommon"], function(exports) {
 			async : { // 异步加载
 				type : "get",
 				enable : _this.config.loadEnable,
-				url : reqBasePath + _this.config.url,
+				url : _this.config.url,
 				autoParam : ["id=parentId"],// 异步加载时需要自动提交父节点属性的参数
 				dataType : "json",
 				dataFilter : function(treeId, treeNode, responseData) {
@@ -266,7 +259,6 @@ layui.define(['layer', "fsCommon"], function(exports) {
 		var _this = this;
 		var funcNo = _this.config.funcNo;
 		var url = _this.config.url; // 请求url
-
 		if (isNull(funcNo) && isNull(url)) {
 			fsCommon.warnMsg("功能号或请求地址为空!");
 			return;
@@ -315,28 +307,28 @@ layui.define(['layer', "fsCommon"], function(exports) {
 				}
 			}
 			fsCommon.invoke(url, otherParam, function(data) {
-						if (data.returnCode == 0) {
-							var array = data.rows;
-							if (!$.isArray(array)) {
-								array = new Array();
-							}
-							if (domTree.attr("isRoot") !== "0") { // 是否显示根目录
-								var arr = {};
-								arr["open"] = true;
-								arr["isParent"] = true;
-								arr["drag"] = false;
-								arr[_this.config.treeName] = "全部";
-								arr[_this.config.treeIdKey] = 0;
-								array.push(arr);
-							}
-							_this.showTree(array);
-						} else {
-							// 提示错误消息
-							fsCommon.warnMsg(data.returnMessage, {
-										icon : 0
-									});
-						}
-					}, false, method);
+				if (data.returnCode == 0) {
+					var array = data.rows;
+					if (!$.isArray(array)) {
+						array = new Array();
+					}
+					if (domTree.attr("isRoot") !== "0") { // 是否显示根目录
+						var arr = {};
+						arr["open"] = true;
+						arr["isParent"] = true;
+						arr["drag"] = false;
+						arr[_this.config.treeName] = "全部";
+						arr[_this.config.treeIdKey] = 0;
+						array.push(arr);
+					}
+					_this.showTree(array);
+				} else {
+					// 提示错误消息
+					fsCommon.warnMsg(data.returnMessage, {
+								icon : 0
+							});
+				}
+			}, false, method);
 		}
 
 	}

web/src/main/resources/template/js/common/enclosureupload.js

@@ -38,7 +38,7 @@ layui.config({
 	    function loadMyEnclosureList(){
 	    	fsTree.render({
 	    		id: "treeDemo",
-	    		url: "sysenclosure010?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
+	    		url: reqBasePath + "sysenclosure010?userToken=" + getCookie('userToken') + "&loginPCIp=" + returnCitySN["cip"],
 	    		checkEnable: true,
 	    		loadEnable: false,//异步加载
 	    		showLine: false,

web/src/main/resources/template/js/common/sysusersel.js

@@ -229,7 +229,7 @@ layui.config({
 		allPeopleFirstLoad = true;
 		fsTree.render({
 			id: "allPeopleTree",
-			url: "commonselpeople001" + urlParams,
+			url: reqBasePath + "commonselpeople001" + urlParams,
 			checkEnable: true,
 			loadEnable: false,//异步加载
 			chkStyle: ztreeCheckType,
@@ -263,7 +263,7 @@ layui.config({
 		accordingCompanyFirstLoad = true;
 		fsTree.render({
 			id: "accordingCompanyTree",
-			url: "commonselpeople002" + urlParams,
+			url: reqBasePath + "commonselpeople002" + urlParams,
 			checkEnable: true,
 			loadEnable: false,//异步加载
 			showLine: false,
@@ -297,7 +297,7 @@ layui.config({
 		accordingDepartmentFirstLoad = true;
 		fsTree.render({
 			id: "accordingDepartmentTree",
-			url: "commonselpeople003" + urlParams,
+			url: reqBasePath + "commonselpeople003" + urlParams,
 			checkEnable: true,
 			loadEnable: false,//异步加载
 			showLine: false,
@@ -331,7 +331,7 @@ layui.config({
 		accordingJobFirstLoad = true;
 		fsTree.render({
 			id: "accordingJobTree",
-			url: "commonselpeople004" + urlParams,
+			url: reqBasePath + "commonselpeople004" + urlParams,
 			checkEnable: true,
 			loadEnable: false,//异步加载
 			showLine: false,
@@ -365,7 +365,7 @@ layui.config({
 		accordingSimpleDepartmentFirstLoad = true;
 		fsTree.render({
 			id: "accordingSimpleDepartmentTree",
-			url: "commonselpeople005" + urlParams,
+			url: reqBasePath + "commonselpeople005" + urlParams,
 			checkEnable: true,
 			loadEnable: false,//异步加载
 			showLine: false,
@@ -399,7 +399,7 @@ layui.config({
 		accordingGroupFirstLoad = true;
 		fsTree.render({
 			id: "accordingGroupTree",
-			url: "commonselpeople006" + urlParams,
+			url: reqBasePath + "commonselpeople006" + urlParams,
 			checkEnable: true,
 			loadEnable: false,//异步加载
 			showLine: false,