商品信息，商品计量单位修改

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

@@ -61,7 +61,7 @@ function loadMaterialDepotStockByDepotId(depotId){
  * @param callBack 回调函数
  */
 function getStockAjaxByDepotAndNormsId(normsIds, depotId, callBack){
-    AjaxPostUtil.request({url: reqBasePath + "material011", params: {depotId: depotId, normsIds: normsIds}, type: 'json', method: "POST", callback: function(json) {
+    AjaxPostUtil.request({url: flowableBasePath + "material011", params: {depotId: depotId, normsIds: normsIds}, type: 'json', method: "POST", callback: function(json) {
         if(json.returnCode == 0) {console.log(typeof(callBack))
             if(typeof(callBack) == "function") {
                 callBack(json);

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

@@ -86,13 +86,12 @@ layui.config({
 			filterId: 'messageTable',
 			fieldName: 'productId'
 		});
-			
-		
+
 		table.render({
 		    id: 'messageTable',
 		    elem: '#messageTable',
 		    method: 'post',
-		    url: reqBasePath + 'material010',
+		    url: flowableBasePath + 'material010',
 		    where: getTableParams(),
 			even: true,
 		    page: true,
@@ -215,7 +214,7 @@ layui.config({
 		var params = {
 			proList: JSON.stringify(proList)
 		};
-		AjaxPostUtil.request({url: reqBasePath + "material015", params: params, type: 'json', callback: function(json) {
+		AjaxPostUtil.request({url: flowableBasePath + "material015", params: params, type: 'json', callback: function(json) {
 			if(json.returnCode == 0) {
 				parent.productMationList = [].concat(json.rows);
 				parent.layer.close(index);

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

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

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

@@ -7,9 +7,7 @@ layui.config({
 }).extend({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form', 'eleTree', 'soulTable'], function (exports) {
-	
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table,
@@ -26,12 +24,11 @@ layui.config({
 	});
 
 	function initTable(){
-		
 		table.render({
 		    id: 'messageTable',
 	        elem: '#messageTable',
 	        method: 'post',
-	        url: reqBasePath + 'material016',
+	        url: flowableBasePath + 'material016',
 	        where: getTableParams(),
 	        even: true,
 	        page: true,

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

@@ -18,7 +18,7 @@ layui.config({
 	    
 	    showGrid({
 		 	id: "showForm",
-		 	url: reqBasePath + "material007",
+		 	url: flowableBasePath + "material007",
 		 	params: {rowId: parent.rowId},
 		 	pagination: false,
 		 	template: getFileContent('tpl/material/materialdetailsTemplate.tpl'),

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

@@ -45,7 +45,7 @@ layui.config({
 	    
 	    showGrid({
 		 	id: "showForm",
-		 	url: reqBasePath + "material008",
+		 	url: flowableBasePath + "material008",
 		 	params: {rowId: parent.rowId},
 		 	pagination: false,
 		 	template: showBaseTemplate,
@@ -116,7 +116,7 @@ layui.config({
 					//加载多单位下拉框
 			 		showGrid({
 					 	id: "unitGroupId",
-					 	url: reqBasePath + "materialunit006",
+					 	url: flowableBasePath + "materialunit006",
 					 	params: {},
 					 	pagination: false,
 					 	template: selTemplate,
@@ -276,12 +276,12 @@ layui.config({
 		 	        	params.extendData = JSON.stringify(extendData);
 		 	        	//工序信息
  	        			params.procedureJsonStr = JSON.stringify(procedureMationList);
-		 	        	AjaxPostUtil.request({url:reqBasePath + "material009", params: params, type:'json', callback:function(json){
+		 	        	AjaxPostUtil.request({url: flowableBasePath + "material009", 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/materiallist.js

@@ -19,7 +19,7 @@ layui.config({
 	    id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: reqBasePath + 'material001',
+        url: flowableBasePath + 'material001',
         where: getTableParams(),
         even: true,
         page: true,
@@ -135,12 +135,12 @@ 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 + "material006", params:{rowId: data.id}, type:'json', callback:function(json){
+            AjaxPostUtil.request({url: flowableBasePath + "material006", 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});
     			}
     		}});
 		});
@@ -150,12 +150,12 @@ layui.config({
 	function down(data){
 		layer.confirm(systemLanguage["com.skyeye.disableOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.disableOperation"][languageType]}, function(index) {
 			layer.close(index);
-            AjaxPostUtil.request({url:reqBasePath + "material004", params:{rowId: data.id}, type:'json', callback:function(json){
+            AjaxPostUtil.request({url: flowableBasePath + "material004", params: {rowId: data.id}, type: 'json', callback: function(json){
     			if(json.returnCode == 0){
-    				winui.window.msg(systemLanguage["com.skyeye.disableOperationSuccessMsg"][languageType], {icon: 1,time: 2000});
+    				winui.window.msg(systemLanguage["com.skyeye.disableOperationSuccessMsg"][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});
     			}
     		}});
 		});
@@ -165,12 +165,12 @@ layui.config({
 	function up(data){
 		layer.confirm(systemLanguage["com.skyeye.enableOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.enableOperation"][languageType]}, function(index) {
 			layer.close(index);
-            AjaxPostUtil.request({url:reqBasePath + "material005", params:{rowId: data.id}, type:'json', callback:function(json){
+            AjaxPostUtil.request({url: flowableBasePath + "material005", params: {rowId: data.id}, type: 'json', callback: function(json){
     			if(json.returnCode == 0){
-    				winui.window.msg(systemLanguage["com.skyeye.enableOperationSuccessMsg"][languageType], {icon: 1,time: 2000});
+    				winui.window.msg(systemLanguage["com.skyeye.enableOperationSuccessMsg"][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});
     			}
     		}});
 		});

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

@@ -13,7 +13,7 @@ layui.config({
 	    id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: reqBasePath + 'material012',
+        url: flowableBasePath + 'material012',
         where: {mUnitId: parent.mUnitId},
         even: true,
         page: true,

erp/src/main/resources/template/js/materialunit/materialunitadd.js

@@ -39,12 +39,12 @@ layui.config({
  	        		unitName: $("#unitName").val(),
 	 	        	unitNameStr: JSON.stringify(tableData)
  	        	};
- 	        	AjaxPostUtil.request({url:reqBasePath + "materialunit002", params: params, type:'json', callback:function(json){
+ 	        	AjaxPostUtil.request({url: flowableBasePath + "materialunit002", 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/materialunit/materialunitedit.js

@@ -18,7 +18,7 @@ layui.config({
 	    
 	    showGrid({
 		 	id: "showForm",
-		 	url: reqBasePath + "materialunit004",
+		 	url: flowableBasePath + "materialunit004",
 		 	params: {rowId: parent.rowId},
 		 	pagination: false,
 		 	template: getFileContent('tpl/materialunit/materialuniteditTemplate.tpl'),
@@ -56,12 +56,12 @@ layui.config({
 			 	        	unitNameStr: JSON.stringify(tableData),
 			 	        	rowId: parent.rowId
 		 	        	};
-		 	        	AjaxPostUtil.request({url:reqBasePath + "materialunit005", params: params, type:'json', callback:function(json){
+		 	        	AjaxPostUtil.request({url: flowableBasePath + "materialunit005", 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/materialunit/materialunitlist.js

@@ -21,7 +21,7 @@ layui.config({
 	    id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: reqBasePath + 'materialunit001',
+        url: flowableBasePath + 'materialunit001',
         where: {groupName: $("#groupName").val()},
         even: true,
         page: true,
@@ -81,13 +81,12 @@ layui.config({
 		var msg = '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除计量单位' }, function (index) {
 			layer.close(index);
-            
-            AjaxPostUtil.request({url:reqBasePath + "materialunit003", params:{rowId: data.id}, type:'json', callback:function(json){
+            AjaxPostUtil.request({url: flowableBasePath + "materialunit003", 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});
     			}
     		}});
 		});

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

@@ -34,7 +34,7 @@
 		                    <input type="text" id="name" name="name" placeholder="请输入要搜索的节点" class="layui-input" />
 		                </div>
 		            </div>
-		            <div class="layui-inline" style="max-height: 200px; width: 100%">
+		            <div class="layui-inline" style="max-height: 200px; width: 100%; overflow-y: auto;">
 		            	<ul id="materialCategoryType" class="ztree fsTree" method="get" isRoot="0"
    							treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name" style="overflow-y: auto; height: 100%;"></ul>
 		            </div>

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

@@ -53,7 +53,7 @@
 		                <input type="text" id="name" name="name" placeholder="请输入要搜索的节点" class="layui-input" />
 		            </div>
 		        </div>
-		        <div class="layui-inline" style="max-height: 200px; width: 100%">
+		        <div class="layui-inline" style="max-height: 200px; width: 100%; overflow-y: auto;">
 		            <ul id="materialCategoryType" class="ztree fsTree" method="get" isRoot="0"
    						treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name" style="overflow-y: auto; height: 100%;"></ul>
 		        </div>