diff --git a/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js b/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js
index 8f83f6eb5d439995b4992ab87fa69486f8803349..ed18df2fde6633122797f66c40373a4c9a665f61 100644
--- a/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js
+++ b/erp/src/main/resources/template/js/erpstatistics/incomingstatistics.js
@@ -11,7 +11,6 @@ layui.config({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
     winui.renderColor();
-
     var $ = layui.$,
         form = layui.form,
         laydate = layui.laydate,
diff --git a/erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js b/erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js
index 617611be93fd17e09079a195f8b4fef00bf2debb..7b230391a73a75d6697db2abe9946df83cb0b580 100644
--- a/erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js
+++ b/erp/src/main/resources/template/js/otherwarehous/otherwarehousadd.js
@@ -1,9 +1,6 @@
 //商品信息
 var productMation = {};
 
-//供应商信息
-var supplierMation = {};
-
 //根据那一列的值进行变化,默认根据数量
 var showTdByEdit = 'rkNum';
 //表格的序号
@@ -121,10 +118,6 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId){
-		if (isNull(supplierMation.id)) {
-			winui.window.msg('请选择供应商.', {icon: 2, time: 2000});
-			return false;
-		}
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if (rowTr.length == 0) {
@@ -171,7 +164,7 @@ layui.config({
 		}
 
 		var params = {
-			supplierId: supplierMation.id,
+			supplierId: sysSupplierUtil.supplierMation.id,
 			operTime: $("#operTime").val(),
 			accountId: $("#accountId").val(),
 			payType: $("#payType").val(),
@@ -249,21 +242,8 @@ layui.config({
 
 	//供应商选择
 	$("body").on("click", "#supplierNameSel", function (e) {
-		_openNewWindows({
-			url: "../../tpl/supplier/supplierChoose.html",
-			title: "选择供应商",
-			pageId: "supplierChoose",
-			area: ['90vw', '90vh'],
-			callBack: function (refreshCode) {
-				if (refreshCode == '0') {
-					$("#supplierName").val(supplierMation.supplierName);
-				} else if (refreshCode == '-9999') {
-					winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {
-						icon: 2,
-						time: 2000
-					});
-				}
-			}
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+			$("#supplierName").val(supplierMation.supplierName);
 		});
 	});
 
diff --git a/erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js b/erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js
index 8a256fa476ad6fe021a90bfe037722112070f1d0..8d61a8bb90b81e9f19a059b9623bc2c22925917c 100644
--- a/erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js
+++ b/erp/src/main/resources/template/js/otherwarehous/otherwarehousedit.js
@@ -1,9 +1,6 @@
 //商品信息
 var productMation = {};
 
-//供应商信息
-var supplierMation = {};
-
 //根据那一列的值进行变化,默认根据数量
 var showTdByEdit = 'rkNum';
 //表格的序号
@@ -63,7 +60,7 @@ layui.config({
 				submitType = json.bean.submitType;
 
 				// 供应商信息赋值
-				supplierMation = {
+				sysSupplierUtil.supplierMation = {
 					id: json.bean.organId,
 					supplierName: json.bean.supplierName
 				}
@@ -190,10 +187,6 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId){
-		if(isNull(supplierMation.id)){
-			winui.window.msg('请选择供应商.', {icon: 2, time: 2000});
-			return false;
-		}
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {
@@ -240,7 +233,7 @@ layui.config({
 		}
 
 		var params = {
-			supplierId: supplierMation.id,
+			supplierId: sysSupplierUtil.supplierMation.id,
 			operTime: $("#operTime").val(),
 			accountId: $("#accountId").val(),
 			payType: $("#payType").val(),
@@ -317,20 +310,11 @@ layui.config({
 		}
 	}
 
-	//供应商选择
+	// 供应商选择
 	$("body").on("click", "#supplierNameSel", function(e){
-		_openNewWindows({
-			url: "../../tpl/supplier/supplierChoose.html",
-			title: "选择供应商",
-			pageId: "supplierChoose",
-			area: ['90vw', '90vh'],
-			callBack: function(refreshCode){
-				if (refreshCode == '0') {
-					$("#supplierName").val(supplierMation.supplierName);
-				} else if (refreshCode == '-9999') {
-					winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
-				}
-			}});
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+			$("#supplierName").val(supplierMation.supplierName);
+		});
 	});
 
 	//商品选择
diff --git a/erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js b/erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js
index d7ed3512bc29b4d657a86974dfec4ac26ef6a6d8..aae4877c3c3b1141174f1a7d31f1c77335213e2e 100644
--- a/erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js
+++ b/erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js
@@ -1,9 +1,6 @@
 // 商品信息
 var productMation = {};
 
-// 供应商信息
-var supplierMation = {};
-
 // 生产订单信息
 var productionMation = {};
 
@@ -125,10 +122,6 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId){
-		if(isNull(supplierMation.id)){
-			winui.window.msg('请选择供应商.', {icon: 2, time: 2000});
-			return false;
-		}
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {
@@ -174,7 +167,7 @@ layui.config({
 		}
 
 		var params = {
-			supplierId: supplierMation.id,
+			supplierId: sysSupplierUtil.supplierMation.id,
 			operTime: $("#operTime").val(),
 			accountId: $("#accountId").val(),
 			payType: $("#payType").val(),
@@ -252,20 +245,11 @@ layui.config({
 		}
 	}
 
-	//供应商选择
+	// 供应商选择
 	$("body").on("click", "#supplierNameSel", function(e){
-		_openNewWindows({
-			url: "../../tpl/supplier/supplierChoose.html",
-			title: "选择供应商",
-			pageId: "supplierChoose",
-			area: ['90vw', '90vh'],
-			callBack: function(refreshCode){
-				if (refreshCode == '0') {
-					$("#supplierName").val(supplierMation.supplierName);
-				} else if (refreshCode == '-9999') {
-					winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
-				}
-			}});
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+			$("#supplierName").val(supplierMation.supplierName);
+		});
 	});
 
 	//商品选择
diff --git a/erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js b/erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js
index 1cff361de39b086681505555bb41808d378bac56..ca789aff059119e404cf58ab82f018f6217249d8 100644
--- a/erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js
+++ b/erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js
@@ -1,9 +1,6 @@
 //商品信息
 var productMation = {};
 
-//供应商信息
-var supplierMation = {};
-
 //生产订单信息
 var productionMation = {};
 
@@ -67,7 +64,7 @@ layui.config({
 			if(json.returnCode == 0) {
 				submitType = json.bean.submitType;
 				// 供应商信息赋值
-				supplierMation = {
+				sysSupplierUtil.supplierMation = {
 					id: json.bean.organId,
 					supplierName: json.bean.supplierName
 				}
@@ -197,10 +194,6 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId){
-		if(isNull(supplierMation.id)){
-			winui.window.msg('请选择供应商.', {icon: 2, time: 2000});
-			return false;
-		}
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {
@@ -246,7 +239,7 @@ layui.config({
 		}
 
 		var params = {
-			supplierId: supplierMation.id,
+			supplierId: sysSupplierUtil.supplierMation.id,
 			operTime: $("#operTime").val(),
 			accountId: $("#accountId").val(),
 			payType: $("#payType").val(),
@@ -325,20 +318,11 @@ layui.config({
 		}
 	}
 
-	//供应商选择
+	// 供应商选择
 	$("body").on("click", "#supplierNameSel", function(e){
-		_openNewWindows({
-			url: "../../tpl/supplier/supplierChoose.html",
-			title: "选择供应商",
-			pageId: "supplierChoose",
-			area: ['90vw', '90vh'],
-			callBack: function(refreshCode){
-				if (refreshCode == '0') {
-					$("#supplierName").val(supplierMation.supplierName);
-				} else if (refreshCode == '-9999') {
-					winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
-				}
-			}});
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+			$("#supplierName").val(supplierMation.supplierName);
+		});
 	});
 
 	//商品选择
diff --git a/erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js b/erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js
index 40e1c277603b93fff9e5bb13a307f51909db027c..e40de7013064b48d1a390cc3094b705a0c6b2501 100644
--- a/erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js
+++ b/erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js
@@ -1,9 +1,6 @@
 //商品信息
 var productMation = {};
 
-//供应商信息
-var supplierMation = {};
-
 //根据那一列的值进行变化,默认根据数量
 var showTdByEdit = 'rkNum';
 //表格的序号
@@ -81,7 +78,7 @@ layui.config({
 				}
 
 				//供应商信息赋值
-				supplierMation = {
+				sysSupplierUtil.supplierMation = {
 					id: json.bean.organId,
 					supplierName: json.bean.supplierName
 				}
@@ -204,10 +201,6 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId){
-		if(isNull(supplierMation.id)){
-			winui.window.msg('请选择供应商.', {icon: 2, time: 2000});
-			return false;
-		}
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {
@@ -272,7 +265,7 @@ layui.config({
 		});
 
 		var params = {
-			supplierId: supplierMation.id,
+			supplierId: sysSupplierUtil.supplierMation.id,
 			operTime: $("#operTime").val(),
 			accountId: $("#accountId").val(),
 			payType: $("#payType").val(),
@@ -359,20 +352,11 @@ layui.config({
 		}
 	}
 
-	//供应商选择
+	// 供应商选择
 	$("body").on("click", "#supplierNameSel", function(e){
-		_openNewWindows({
-			url: "../../tpl/supplier/supplierChoose.html",
-			title: "选择供应商",
-			pageId: "supplierChoose",
-			area: ['90vw', '90vh'],
-			callBack: function(refreshCode){
-				if (refreshCode == '0') {
-					$("#supplierName").val(supplierMation.supplierName);
-				} else if (refreshCode == '-9999') {
-					winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
-				}
-			}});
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+			$("#supplierName").val(supplierMation.supplierName);
+		});
 	});
 
 	//商品选择
diff --git a/erp/src/main/resources/template/js/purchaseput/purchaseputadd.js b/erp/src/main/resources/template/js/purchaseput/purchaseputadd.js
index b2a7265831d48b1c988fee78e9953db746f67413..a294f5a615896c98b87fbe8682d540e6651e3135 100644
--- a/erp/src/main/resources/template/js/purchaseput/purchaseputadd.js
+++ b/erp/src/main/resources/template/js/purchaseput/purchaseputadd.js
@@ -1,9 +1,6 @@
 //商品信息
 var productMation = {};
 
-//供应商信息
-var supplierMation = {};
-
 //根据那一列的值进行变化,默认根据数量
 var showTdByEdit = 'rkNum';
 //表格的序号
@@ -133,10 +130,6 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId){
-		if(isNull(supplierMation.id)){
-			winui.window.msg('请选择供应商.', {icon: 2, time: 2000});
-			return false;
-		}
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {
@@ -197,7 +190,7 @@ layui.config({
 		});
 
 		var params = {
-			supplierId: supplierMation.id,
+			supplierId: sysSupplierUtil.supplierMation.id,
 			operTime: $("#operTime").val(),
 			accountId: $("#accountId").val(),
 			payType: $("#payType").val(),
@@ -276,20 +269,11 @@ layui.config({
 		}
 	}
 
-	//供应商选择
+	// 供应商选择
 	$("body").on("click", "#supplierNameSel", function(e){
-		_openNewWindows({
-			url: "../../tpl/supplier/supplierChoose.html",
-			title: "选择供应商",
-			pageId: "supplierChoose",
-			area: ['90vw', '90vh'],
-			callBack: function(refreshCode){
-				if (refreshCode == '0') {
-					$("#supplierName").val(supplierMation.supplierName);
-				} else if (refreshCode == '-9999') {
-					winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
-				}
-			}});
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+			$("#supplierName").val(supplierMation.supplierName);
+		});
 	});
 
 	//商品选择
diff --git a/erp/src/main/resources/template/js/purchaseput/purchaseputedit.js b/erp/src/main/resources/template/js/purchaseput/purchaseputedit.js
index a7286bee98e012b54d8284297aaf6988ab6c7430..bab44956b7e6b414d235f349577143f848e2f01e 100644
--- a/erp/src/main/resources/template/js/purchaseput/purchaseputedit.js
+++ b/erp/src/main/resources/template/js/purchaseput/purchaseputedit.js
@@ -1,9 +1,6 @@
 //商品信息
 var productMation = {};
 
-//供应商信息
-var supplierMation = {};
-
 //根据那一列的值进行变化,默认根据数量
 var showTdByEdit = 'rkNum';
 //表格的序号
@@ -72,7 +69,7 @@ layui.config({
 				submitType = json.bean.submitType;
 
 				// 供应商信息赋值
-				supplierMation = {
+				sysSupplierUtil.supplierMation = {
 					id: json.bean.organId,
 					supplierName: json.bean.supplierName
 				}
@@ -215,10 +212,6 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId){
-		if(isNull(supplierMation.id)){
-			winui.window.msg('请选择供应商.', {icon: 2, time: 2000});
-			return false;
-		}
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {
@@ -279,7 +272,7 @@ layui.config({
 		});
 
 		var params = {
-			supplierId: supplierMation.id,
+			supplierId: sysSupplierUtil.supplierMation.id,
 			operTime: $("#operTime").val(),
 			accountId: $("#accountId").val(),
 			payType: $("#payType").val(),
@@ -359,20 +352,11 @@ layui.config({
 		}
 	}
 
-	//供应商选择
+	// 供应商选择
 	$("body").on("click", "#supplierNameSel", function(e){
-		_openNewWindows({
-			url: "../../tpl/supplier/supplierChoose.html",
-			title: "选择供应商",
-			pageId: "supplierChoose",
-			area: ['90vw', '90vh'],
-			callBack: function(refreshCode){
-				if (refreshCode == '0') {
-					$("#supplierName").val(supplierMation.supplierName);
-				} else if (refreshCode == '-9999') {
-					winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
-				}
-			}});
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+			$("#supplierName").val(supplierMation.supplierName);
+		});
 	});
 
 	//商品选择
diff --git a/erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js b/erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js
index 5aa671ecea927930c6f53cb6a25fe17afc42c8db..956cceddf5e4cdc3223a7c7be7e128db32ef9c1f 100644
--- a/erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js
+++ b/erp/src/main/resources/template/js/purchasereturns/purchasereturnsadd.js
@@ -1,9 +1,6 @@
 //商品信息
 var productMation = {};
 
-//供应商信息
-var supplierMation = {};
-
 //根据那一列的值进行变化,默认根据数量
 var showTdByEdit = 'rkNum';
 //表格的序号
@@ -135,10 +132,6 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId){
-		if(isNull(supplierMation.id)){
-			winui.window.msg('请选择供应商.', {icon: 2, time: 2000});
-			return false;
-		}
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {
@@ -199,7 +192,7 @@ layui.config({
 		});
 
 		var params = {
-			supplierId: supplierMation.id,
+			supplierId: sysSupplierUtil.supplierMation.id,
 			operTime: $("#operTime").val(),
 			accountId: $("#accountId").val(),
 			payType: $("#payType").val(),
@@ -280,18 +273,9 @@ layui.config({
 
 	//供应商选择
 	$("body").on("click", "#supplierNameSel", function(e){
-		_openNewWindows({
-			url: "../../tpl/supplier/supplierChoose.html",
-			title: "选择供应商",
-			pageId: "supplierChoose",
-			area: ['90vw', '90vh'],
-			callBack: function(refreshCode){
-				if (refreshCode == '0') {
-					$("#supplierName").val(supplierMation.supplierName);
-				} else if (refreshCode == '-9999') {
-					winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
-				}
-			}});
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+			$("#supplierName").val(supplierMation.supplierName);
+		});
 	});
 
 	//商品选择
diff --git a/erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js b/erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js
index 9e5c5f8f8bb0ed623d87767388f16d5cbe101159..852fe5c2bb697d7f4e62fb601ca15adbb3e210fe 100644
--- a/erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js
+++ b/erp/src/main/resources/template/js/purchasereturns/purchasereturnsedit.js
@@ -1,9 +1,6 @@
 //商品信息
 var productMation = {};
 
-//供应商信息
-var supplierMation = {};
-
 //根据那一列的值进行变化,默认根据数量
 var showTdByEdit = 'rkNum';
 //表格的序号
@@ -74,7 +71,7 @@ layui.config({
 				submitType = json.bean.submitType;
 
 				//供应商信息赋值
-				supplierMation = {
+				sysSupplierUtil.supplierMation = {
 					id: json.bean.organId,
 					supplierName: json.bean.supplierName
 				}
@@ -210,10 +207,6 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId){
-		if(isNull(supplierMation.id)){
-			winui.window.msg('请选择供应商.', {icon: 2, time: 2000});
-			return false;
-		}
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {
@@ -274,7 +267,7 @@ layui.config({
 		});
 
 		var params = {
-			supplierId: supplierMation.id,
+			supplierId: sysSupplierUtil.supplierMation.id,
 			operTime: $("#operTime").val(),
 			accountId: $("#accountId").val(),
 			payType: $("#payType").val(),
@@ -354,20 +347,11 @@ layui.config({
 		}
 	}
 
-	//供应商选择
+	// 供应商选择
 	$("body").on("click", "#supplierNameSel", function(e){
-		_openNewWindows({
-			url: "../../tpl/supplier/supplierChoose.html",
-			title: "选择供应商",
-			pageId: "supplierChoose",
-			area: ['90vw', '90vh'],
-			callBack: function(refreshCode){
-				if (refreshCode == '0') {
-					$("#supplierName").val(supplierMation.supplierName);
-				} else if (refreshCode == '-9999') {
-					winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
-				}
-			}});
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+			$("#supplierName").val(supplierMation.supplierName);
+		});
 	});
 
 	//商品选择
diff --git a/erp/src/main/resources/template/js/supplier/supplierChoose.js b/erp/src/main/resources/template/js/supplier/supplierChoose.js
index 54a94a5c2497919a952524a3b5ef096deb48d615..c20e2a5c9a7b55384f85c508c6e1cff64e5fca78 100644
--- a/erp/src/main/resources/template/js/supplier/supplierChoose.js
+++ b/erp/src/main/resources/template/js/supplier/supplierChoose.js
@@ -6,10 +6,8 @@ layui.config({
 }).extend({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
-	
 	winui.renderColor();
 	var index = parent.layer.getFrameIndex(window.name);
-	
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
@@ -51,7 +49,7 @@ layui.config({
 				form.render();
 				var id = JSON.stringify(dubClick.data('index'));
 				var obj = res.rows[id];
-				parent.supplierMation = obj;
+				parent.sysSupplierUtil.supplierMation = obj;
 				parent.layer.close(index);
 				parent.refreshCode = '0';
 			});
@@ -71,14 +69,28 @@ layui.config({
             selectSupplier(data)
         }
     });
+
+	// 详情
+	function selectSupplier(data){
+		rowId = data.id;
+		_openNewWindows({
+			url: "../../tpl/supplier/supplierinfo.html",
+			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+			pageId: "supplierinfo",
+			area: ['90vw', '90vh'],
+			callBack: function(refreshCode){
+			}
+		});
+	}
 	
 	form.render();
-	
-	
-	$("body").on("click", "#formSearch", function(){
-		refreshTable();
+	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();
     });
@@ -87,23 +99,6 @@ layui.config({
     	table.reload("messageTable", {where: getTableParams()});
     }
     
-    function refreshTable(){
-    	table.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
-    }
-
-	//详情
-    function selectSupplier(data){
-        rowId = data.id;
-        _openNewWindows({
-            url: "../../tpl/supplier/supplierinfo.html",
-            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
-            pageId: "supplierinfo",
-            area: ['90vw', '90vh'],
-            callBack: function(refreshCode){
-            }
-        });
-    }
-	
 	function getTableParams(){
 		return {
 			supplierName:$("#supplierName").val(),
diff --git a/erp/src/main/resources/template/tpl/otherwarehous/otherwarehousadd.html b/erp/src/main/resources/template/tpl/otherwarehous/otherwarehousadd.html
index 821d6fdf52a4c62a3ee92b0b96664b5df28c56f9..c93d5517dcc897f49b77b79d5a13d26a147139fd 100644
--- a/erp/src/main/resources/template/tpl/otherwarehous/otherwarehousadd.html
+++ b/erp/src/main/resources/template/tpl/otherwarehous/otherwarehousadd.html
@@ -12,7 +12,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="supplierName" name="supplierName" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
+		            <input type="text" id="supplierName" name="supplierName" win-verify="required" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="supplierNameSel"></i>
 		        </div>
 		    </div>
diff --git a/erp/src/main/resources/template/tpl/otherwarehous/otherwarehousedit.html b/erp/src/main/resources/template/tpl/otherwarehous/otherwarehousedit.html
index 5e06b4bdb572d7456fef7d68b292484f98ec97a0..50b99b1d942ec9f3d3ee2f48ae757eb63064aa0b 100644
--- a/erp/src/main/resources/template/tpl/otherwarehous/otherwarehousedit.html
+++ b/erp/src/main/resources/template/tpl/otherwarehous/otherwarehousedit.html
@@ -12,7 +12,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="supplierName" name="supplierName" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
+		            <input type="text" id="supplierName" name="supplierName" win-verify="required" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="supplierNameSel"></i>
 		        </div>
 		    </div>
diff --git a/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderadd.html b/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderadd.html
index be6d911b561f5dc55e877f88fe2d315f1b0646e6..94ea138357bef8f4ba6ac0eb3a9723577a29b08e 100644
--- a/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderadd.html
+++ b/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderadd.html
@@ -16,7 +16,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="supplierName" name="supplierName" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
+		            <input type="text" id="supplierName" name="supplierName" win-verify="required" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="supplierNameSel"></i>
 		        </div>
 		    </div>
diff --git a/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderedit.html b/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderedit.html
index 377397746428ad2040b01bbb44c21f79479c0154..7f85dd360dbea3715ef13439149067c4bffeb445 100644
--- a/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderedit.html
+++ b/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderedit.html
@@ -15,7 +15,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="supplierName" name="supplierName" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
+		            <input type="text" id="supplierName" name="supplierName" win-verify="required" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="supplierNameSel"></i>
 		        </div>
 		    </div>
diff --git a/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderpurchase.html b/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderpurchase.html
index 793a42cc30cf38ddb39463ad0179a72cd5ce62ae..ccbcf15eb8d567d8bcaec55133071b70ac9acd49 100644
--- a/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderpurchase.html
+++ b/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderpurchase.html
@@ -12,7 +12,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="supplierName" name="supplierName" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
+		            <input type="text" id="supplierName" name="supplierName" win-verify="required" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="supplierNameSel"></i>
 		        </div>
 		    </div>
diff --git a/erp/src/main/resources/template/tpl/purchaseput/purchaseputadd.html b/erp/src/main/resources/template/tpl/purchaseput/purchaseputadd.html
index 74753a9ad713f143b22f95834dfa2c6f854fff76..e9fdab6435718372f5196a2a7a425c234ae33916 100644
--- a/erp/src/main/resources/template/tpl/purchaseput/purchaseputadd.html
+++ b/erp/src/main/resources/template/tpl/purchaseput/purchaseputadd.html
@@ -15,7 +15,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="supplierName" name="supplierName" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
+		            <input type="text" id="supplierName" name="supplierName" win-verify="required" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="supplierNameSel"></i>
 		        </div>
 		    </div>
diff --git a/erp/src/main/resources/template/tpl/purchaseput/purchaseputedit.html b/erp/src/main/resources/template/tpl/purchaseput/purchaseputedit.html
index 1a0345e91336124186f9992654a68b1fe697c895..86b8b4de6ad97b54d61328e2407c9b56376f4bfd 100644
--- a/erp/src/main/resources/template/tpl/purchaseput/purchaseputedit.html
+++ b/erp/src/main/resources/template/tpl/purchaseput/purchaseputedit.html
@@ -15,7 +15,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="supplierName" name="supplierName" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
+		            <input type="text" id="supplierName" name="supplierName" win-verify="required" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="supplierNameSel"></i>
 		        </div>
 		    </div>
diff --git a/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsadd.html b/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsadd.html
index c5b4ba20616e370c9d9fade853051e1dc2ff4602..201ce6dbecf190385138b2d89a6fe2cc535af091 100644
--- a/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsadd.html
+++ b/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsadd.html
@@ -15,7 +15,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="supplierName" name="supplierName" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
+		            <input type="text" id="supplierName" name="supplierName" win-verify="required" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="supplierNameSel"></i>
 		        </div>
 		    </div>
diff --git a/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsedit.html b/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsedit.html
index 26dcd43413370ef613ef612bc380bf34e7096e0d..9df39097325abddfde908f30ab88056fd5afbf6e 100644
--- a/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsedit.html
+++ b/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsedit.html
@@ -15,7 +15,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <input type="text" id="supplierName" name="supplierName" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
+		            <input type="text" id="supplierName" name="supplierName" win-verify="required" placeholder="请选择供应商" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="supplierNameSel"></i>
 		        </div>
 		    </div>
diff --git a/erp/src/main/resources/template/tpl/supplier/supplierChoose.html b/erp/src/main/resources/template/tpl/supplier/supplierChoose.html
index 084009ffe2a60fcb2d448ee49b2c5717133f0e04..01ea248e341b4876849e025b850928fb2527f971 100644
--- a/erp/src/main/resources/template/tpl/supplier/supplierChoose.html
+++ b/erp/src/main/resources/template/tpl/supplier/supplierChoose.html
@@ -31,7 +31,7 @@
 	                    <input type="text" id="fax" name="fax" 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>
diff --git a/ifs/src/main/resources/template/js/income/incomeAdd.js b/ifs/src/main/resources/template/js/income/incomeAdd.js
index c315133b4cc3b7338556b2bff834dca1919964ff..9827b01a8e91bdf1caffc98ac4de73499ea88296 100644
--- a/ifs/src/main/resources/template/js/income/incomeAdd.js
+++ b/ifs/src/main/resources/template/js/income/incomeAdd.js
@@ -67,6 +67,11 @@ layui.config({
         return false;
     });
 
+    // 往来单位变化监听
+    form.on('select(correspondentUnitType)', function(data){
+        $("#customName").val("");
+    });
+
     $('#handsPersonId').tagEditor({
         initialTags: [],
         placeholder: '请选择经手人员',
@@ -110,11 +115,21 @@ layui.config({
         voucherUtil.addItem();
     });
 
-    // 客户选择
+    // 往来单位选择
     $("body").on("click", "#customMationSel", function(e){
-        sysCustomerUtil.openSysCustomerChoosePage(function (customerMation){
-            $("#customName").val(customerMation.customName);
-        });
+        var correspondentUnitType = $("#correspondentUnitType").val();
+        if(correspondentUnitType == 1){
+            // 供应商
+            sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+                $("#customName").val(supplierMation.supplierName);
+            });
+        } else if (correspondentUnitType == 2){
+            // 客户
+            sysCustomerUtil.openSysCustomerChoosePage(function (customerMation){
+                $("#customName").val(customerMation.customName);
+            });
+        }
+
     });
 
     // 选择账套
diff --git a/ifs/src/main/resources/template/tpl/income/incomeAdd.html b/ifs/src/main/resources/template/tpl/income/incomeAdd.html
index 8c8c1377f15601ec8f2218aff653ff29bcf1b3ab..439373bec81d947a35304985ce9beef501dc8321 100644
--- a/ifs/src/main/resources/template/tpl/income/incomeAdd.html
+++ b/ifs/src/main/resources/template/tpl/income/incomeAdd.html
@@ -13,9 +13,15 @@
 			<div class="layui-form-item layui-col-xs12">
 				<span class="hr-title">基本信息</span><hr>
 			</div>
-	        <div class="layui-form-item layui-col-xs6">
+	        <div class="layui-form-item layui-col-xs6" style="height: 40px">
 	            <label class="layui-form-label">往来单位<i class="red">*</i></label>
-	            <div class="layui-input-block">
+				<div class="layui-input-block" style="width: 80px">
+					<select id="correspondentUnitType" lay-search win-verify="required" lay-filter="correspondentUnitType" style="width: 100px">
+						<option value="1">供应商</option>
+						<option value="2">客户</option>
+					</select>
+				</div>
+	            <div class="layui-input-block" style="width: calc(100% - 220px); top: -40px; left: 85px;">
 	                <input type="text" id="customName" name="customName" win-verify="required" placeholder="请选择往来单位" class="layui-input" readonly="readonly"/>
 		            <i class="fa fa-plus-circle input-icon" id="customMationSel"></i>
 	            </div>
@@ -34,9 +40,9 @@
 				</div>
 			</div>
 			<div class="layui-form-item layui-col-xs6">
-				<label class="layui-form-label">单据类型<i class="red">*</i></label>
+				<label class="layui-form-label">类型<i class="red">*</i></label>
 				<div class="layui-input-block">
-					<input type="text" id="orderType" name="orderType" win-verify="required" placeholder="请选择单据类型" class="layui-input" readonly="readonly"/>
+					<input type="text" id="orderType" name="orderType" win-verify="required" placeholder="请选择类型" class="layui-input" readonly="readonly"/>
 					<i class="fa fa-plus-circle input-icon" id="chooseOrderTypeBtn"></i>
 				</div>
 			</div>
diff --git a/web/src/main/resources/template/assets/lib/layui/custom.js b/web/src/main/resources/template/assets/lib/layui/custom.js
index 4feab93a443be8606c4b69cdb682f65d59271cc6..80f03b91235ab83b08a04298644312da15614bdf 100644
--- a/web/src/main/resources/template/assets/lib/layui/custom.js
+++ b/web/src/main/resources/template/assets/lib/layui/custom.js
@@ -21,6 +21,7 @@ var customerJS = {
 	"sysIfsUtil": "../../assets/lib/layui/customer/sysIfsUtil.js", // 财务相关的工具函数
 	"sysFileUtil": "../../assets/lib/layui/customer/sysFileUtil.js", // 系统文件相关处理工具
 	"publicKeyCode": "../../assets/lib/layui/customer/publicKeyCode.js", // 快捷键
+	"sysSupplierUtil": "../../assets/lib/layui/customer/sysSupplierUtil.js", // 供应商相关工具
 };
 
 // 编辑加载自定义的js文件
diff --git a/web/src/main/resources/template/assets/lib/layui/customer/sysSupplierUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/sysSupplierUtil.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0e514914203bdfedacf362ea5fcb2ee600736e3
--- /dev/null
+++ b/web/src/main/resources/template/assets/lib/layui/customer/sysSupplierUtil.js
@@ -0,0 +1,32 @@
+
+// 供应商相关工具类
+var sysSupplierUtil = {
+
+    /**
+     * 已经选的的供应商信息
+     */
+    supplierMation: {},
+
+    /**
+     * 供应商选择页面
+     *
+     * @param callback 回调函数
+     */
+    openSysSupplierChoosePage: function (callback){
+        _openNewWindows({
+            url: "../../tpl/supplier/supplierChoose.html",
+            title: "选择供应商",
+            pageId: "supplierChoosePage",
+            area: ['90vw', '90vh'],
+            callBack: function(refreshCode){
+                if (refreshCode == '0') {
+                    if(typeof(callback) == "function") {
+                        callback(sysSupplierUtil.supplierMation);
+                    }
+                } else if (refreshCode == '-9999') {
+                    winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000});
+                }
+            }});
+    },
+
+};
\ No newline at end of file