新增供应商选择工具类，代码优化

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,

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

 //商品信息
 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);
 		});
 	});
 

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

 //商品信息
 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);
+		});
 	});
 
 	//商品选择

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

 // 商品信息
 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);
+		});
 	});
 
 	//商品选择

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

 //商品信息
 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);
+		});
 	});
 
 	//商品选择

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

 //商品信息
 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);
+		});
 	});
 
 	//商品选择

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

 //商品信息
 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);
+		});
 	});
 
 	//商品选择

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

 //商品信息
 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);
+		});
 	});
 
 	//商品选择

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

 //商品信息
 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);
+		});
 	});
 
 	//商品选择

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

 //商品信息
 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);
+		});
 	});
 
 	//商品选择

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(),

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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);
+            });
+        }
+
     });
 
     // 选择账套

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>

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文件

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

+
+// 供应商相关工具类
+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