表格选择插件新增最小数据量参数

admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseAdd.js

@@ -96,7 +96,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选用品数据
 		var rowTr = $("#purchaseTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseEdit.js

@@ -122,7 +122,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选用品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseAdd.js

@@ -98,7 +98,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选用品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseEdit.js

@@ -122,7 +122,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选用品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseAdd.js

@@ -55,7 +55,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选资产数据
 		var rowTr = $("#purchaseTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/assetManagePurchase/assetManagePurchaseEdit.js

@@ -81,7 +81,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选资产数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnAdd.js

@@ -96,7 +96,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选资产数据
 		var rowTr = $("#returnTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/assetManageReturn/assetManageReturnEdit.js

@@ -121,7 +121,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选资产数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseAdd.js

@@ -96,7 +96,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选资产数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseEdit.js

@@ -120,7 +120,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选资产数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveAdd.js

@@ -55,7 +55,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			title: $("#title").html(),
 			startTime: $("#reserveTime").val().split(' - ')[0].trim(),

admin-assistant/src/main/resources/template/js/conFerenceRoomReserve/conFerenceRoomReserveEdit.js

@@ -70,7 +70,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			rowId: parent.rowId,
 			startTime: $("#reserveTime").val().split(' - ')[0].trim(),

admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowAdd.js

@@ -56,7 +56,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选证照数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/licenceManageBorrow/licenceManageBorrowEdit.js

@@ -81,7 +81,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选证照数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertAdd.js

@@ -55,7 +55,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选证照数据
 		var rowTr = $("#revertTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/licenceManageRevert/licenceManageRevertEdit.js

@@ -80,7 +80,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选证照数据
 		var rowTr = $("#revertTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowAdd.js

@@ -56,7 +56,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选印章数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/sealManageBorrow/sealManageBorrowEdit.js

@@ -81,7 +81,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选印章数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertAdd.js

@@ -60,7 +60,7 @@ layui.config({
 			return false;
 		});
 
-		function saveData(subType, approvalId){
+		function saveData(subType, approvalId) {
 			// 获取已选印章数据
 			var rowTr = $("#useTable tr");
 			if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/sealManageRevert/sealManageRevertEdit.js

@@ -85,7 +85,7 @@ layui.config({
 			return false;
 		});
 
-		function saveData(subType, approvalId){
+		function saveData(subType, approvalId) {
 			// 获取已选印章数据
 			var rowTr = $("#useTable tr");
 			if(rowTr.length == 0) {

admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseAdd.js

@@ -90,7 +90,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			title: $("#useTitle").html(),
 			passengerNum: $("#passengerNum").val(),

admin-assistant/src/main/resources/template/js/vehicleManageUse/vehicleManageUseEdit.js

@@ -123,7 +123,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			rowId: parent.rowId,
 			passengerNum: $("#passengerNum").val(),

boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferEdit.js

@@ -76,7 +76,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         if(isNull(organizationUtil.getCompanyMation(dtree)['nodeId'])){
             winui.window.msg('请选择企业', {icon: 2, time: 2000});
             return false;

boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitAdd.js

@@ -53,7 +53,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         var params = {
             leaveTime: $("#leaveTime").val(),
 			leaveType: $("#leaveType").val(),

boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitEdit.js

@@ -69,7 +69,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         var params = {
             leaveTime: $("#leaveTime").val(),
 			leaveType: $("#leaveType").val(),

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerAdd.js

@@ -52,7 +52,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         var params = {
             departmentId: $("#departmentId").attr("departmentId"),
 			jobId: $("#jobId").attr("jobId"),

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerEdit.js

@@ -64,7 +64,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         var params = {
             departmentId: $("#departmentId").attr("departmentId"),
             jobId: $("#jobId").attr("jobId"),

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireAdd.js

@@ -46,7 +46,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         var params = {
             recruitDepartmentId: $("#recruitDepartmentId").attr("departmentId"),
             recruitJobId: $("#recruitJobId").val(),

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireEdit.js

@@ -66,7 +66,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         var params = {
             recruitDepartmentId: $("#recruitDepartmentId").attr("departmentId"),
             recruitJobId: $("#recruitJobId").val(),

checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripAdd.js

@@ -81,7 +81,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         // 获取出差日期数据
         var rowTr = $("#beanTable tr");
         if(rowTr.length == 0) {

checkwork/src/main/resources/template/js/checkWorkBusinessTrip/checkWorkBusinessTripEdit.js

@@ -107,7 +107,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         // 获取出差日期数据
         var rowTr = $("#beanTable tr");
         if(rowTr.length == 0) {

checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveAdd.js

@@ -104,7 +104,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         // 获取销假日期数据
         var rowTr = $("#beanTable tr");
         if(rowTr.length == 0) {

checkwork/src/main/resources/template/js/checkWorkCancelLeave/checkWorkCancelLeaveEdit.js

@@ -129,7 +129,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         // 获取销假日期数据
         var rowTr = $("#beanTable tr");
         if(rowTr.length == 0) {

checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveAdd.js

@@ -132,7 +132,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         // 获取请假日期数据
         var rowTr = $("#beanTable tr");
         if(rowTr.length == 0) {

checkwork/src/main/resources/template/js/checkWorkLeave/checkWorkLeaveEdit.js

@@ -158,7 +158,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         // 获取请假日期数据
         var rowTr = $("#beanTable tr");
         if(rowTr.length == 0) {

checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeAdd.js

@@ -48,7 +48,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         // 获取加班日期数据
         var rowTr = $("#beanTable tr");
         if(rowTr.length == 0) {

checkwork/src/main/resources/template/js/checkWorkOvertime/checkWorkOvertimeEdit.js

@@ -73,7 +73,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         // 获取加班日期数据
         var rowTr = $("#beanTable tr");
         if(rowTr.length == 0) {

crm/src/main/resources/template/js/crmOpportunity/crmopportunityadd.js

@@ -56,7 +56,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         if(isNull(customerMation.id)){
             winui.window.msg('请选择客户.', {icon: 2, time: 2000});
             return false;

crm/src/main/resources/template/js/crmOpportunity/crmopportunityedit.js

@@ -170,7 +170,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

crm/src/main/resources/template/js/crmcontractmanage/mycrmcontractedit.js

@@ -139,7 +139,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg("请选择客户", {icon: 2, time: 2000});
 			return false;

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

@@ -108,7 +108,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

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

@@ -172,7 +172,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

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

@@ -106,7 +106,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if (rowTr.length == 0) {

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

@@ -169,7 +169,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -130,10 +130,13 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId) {
-		var dataList = initTableChooseUtil.getDataList('productList');
+		var result = initTableChooseUtil.getDataList('productList');
+		if (!result.checkResult) {
+			return false;
+		}
 		var noError = false;
 		var tableData = [];
-		$.each(dataList, function(i, item) {
+		$.each(result.dataList, function(i, item) {
 			//获取行编号
 			var thisRowKey = item["trcusid"].replace("tr", "");
 			if (parseInt(item.rkNum) == 0) {

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

 
-//生产订单信息
+// 生产订单信息
 var productionMation = {};
 
-//根据那一列的值进行变化,默认根据数量
+// 根据那一列的值进行变化,默认根据数量
 var showTdByEdit = 'rkNum';
-//表格的序号
-var rowNum = 1;
 
 // 兼容动态表单
 var layedit, form;
@@ -26,7 +24,6 @@ layui.config({
 	layedit = layui.layedit,
 	form = layui.form;
 
-	var usetableTemplate = $("#usetableTemplate").html();
 	var selOption = getFileContent('tpl/template/select-option.tpl');
 	//已经选择的商品集合key：表格的行trId，value：商品信息
 	var allChooseProduct = {};
@@ -79,25 +76,28 @@ layui.config({
 			$("#arrears").html(json.bean.arrears.toFixed(2));
 			$("#planComplateTime").val(json.bean.planComplateTime);
 
-			// 加载子单据
-			$.each(json.bean.norms, function(i, item){
-				addRow();
+			initTable();
+			initTableChooseUtil.deleteAllRow('productList');
+			$.each(json.bean.norms, function(i, item) {
+				var params = {
+					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"mUnitId": {
+						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
+						"value": item.mUnitId
+					},
+					"currentTock": item.currentTock,
+					"rkNum": item.operNum,
+					"unitPrice": item.unitPrice.toFixed(2),
+					"amountOfMoney": item.allPrice.toFixed(2),
+					"taxRate": item.taxRate.toFixed(2),
+					"taxMoney": item.taxMoney.toFixed(2),
+					"taxUnitPrice": item.taxUnitPrice.toFixed(2),
+					"taxLastMoney": item.taxLastMoney.toFixed(2),
+					"remark": item.remark
+				};
+				var trcusid = initTableChooseUtil.resetData('productList', params);
 				// 将规格所属的商品信息加入到对象中存储
-				allChooseProduct["tr" + (rowNum - 1)] = item.product;
-				// 单位回显
-				$("#unitId" + (rowNum - 1)).html(getDataUseHandlebars(selOption, {rows: item.product.unitList}));
-				$("#unitId" + (rowNum - 1)).val(item.mUnitId);
-				// 商品回显
-				$("#materialId" + (rowNum - 1)).val(item.product.productName + "(" + item.product.productModel + ")");
-				$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显
-				$("#rkNum" + (rowNum - 1)).val(item.operNum);
-				$("#unitPrice" + (rowNum - 1)).val(item.unitPrice.toFixed(2));
-				$("#amountOfMoney" + (rowNum - 1)).val(item.allPrice.toFixed(2));
-				$("#taxRate" + (rowNum - 1)).val(item.taxRate.toFixed(2));
-				$("#taxMoney" + (rowNum - 1)).val(item.taxMoney.toFixed(2));
-				$("#taxUnitPrice" + (rowNum - 1)).val(item.taxUnitPrice.toFixed(2));
-				$("#taxLastMoney" + (rowNum - 1)).val(item.taxLastMoney.toFixed(2));
-				$("#remark" + (rowNum - 1)).val(item.remark);
+				allChooseProduct[trcusid] = item.product;
 			});
 
 			textool.init({eleId: 'remark', maxlength: 200});
@@ -111,30 +111,60 @@ layui.config({
 		}});
 	}
 
+	function initTable() {
+		initTableChooseUtil.initTable({
+			id: "productList",
+			cols: [
+				{id: 'materialId', title: '商品(型号)', formType: 'chooseInput', width: '150', iconClassName: 'chooseProductBtn', verify: 'required'},
+				{id: 'mUnitId', title: '单位', formType: 'select', width: '50', verify: 'required', layFilter: 'selectUnitProperty'},
+				{id: 'currentTock', title: '库存', formType: 'detail', width: '80'},
+				{id: 'rkNum', title: '数量', formType: 'input', width: '80', className: 'change-input rkNum', verify: 'required|number', value: '1'},
+				{id: 'unitPrice', title: '单价', formType: 'input', width: '80', className: 'change-input unitPrice', verify: 'required|money'},
+				{id: 'amountOfMoney', title: '金额', formType: 'input', width: '80', className: 'change-input amountOfMoney', verify: 'required|money'},
+				{id: 'taxRate', title: '税率(%)', formType: 'input', width: '80', className: 'change-input taxRate', verify: 'required|double', value: '0.00'},
+				{id: 'taxMoney', title: '税额', formType: 'input', width: '80', className: 'change-input taxMoney', verify: 'required|money'},
+				{id: 'taxUnitPrice', title: '含税单价', formType: 'input', width: '80', className: 'change-input taxUnitPrice', verify: 'required|money'},
+				{id: 'taxLastMoney', title: '合计价税', formType: 'input', width: '80', className: 'change-input taxLastMoney', verify: 'required|money'},
+				{id: 'remark', title: '备注', formType: 'input', width: '100'}
+			],
+			deleteRowCallback: function (trcusid) {
+				delete allChooseProduct[trcusid];
+				// 计算价格
+				calculatedTotalPrice();
+			},
+			addRowCallback: function (trcusid) {
+				// 设置根据某列变化的颜色
+				$("." + showTdByEdit).parent().css({'background-color': '#e6e6e6'});
+			},
+			form: form
+		});
+	}
+
 	//商品规格加载变化事件
 	form.on('select(selectUnitProperty)', function(data) {
 		var thisRowValue = data.value;
-		var thisRowNum = data.elem.id.replace("unitId", "");//获取当前行
-		//当前当前行选中的商品信息
-		if(!isNull(thisRowValue) && thisRowValue != '请选择') {
-			var product = allChooseProduct["tr" + thisRowNum.toString()];
-			$.each(product.unitList, function(j, bean) {
-				if(thisRowValue == bean.id){//获取规格
-					//获取当前行数量
-					var rkNum = parseInt($("#rkNum" + thisRowNum).val());
-					$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
-					$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));//金额
+		var thisRowKey = data.elem.id.replace("mUnitId", "").toString();
+		// 当前当前行选中的商品信息
+		if (!isNull(thisRowValue)) {
+			var product = allChooseProduct["tr" + thisRowKey];
+			$.each(product.unitList, function (j, bean) {
+				if (thisRowValue == bean.id) {
+					var rkNum = parseInt($("#rkNum" + thisRowKey).val());
+					// 设置单价和金额
+					$("#unitPrice" + thisRowKey).val(bean.estimatePurchasePrice.toFixed(2));
+					$("#amountOfMoney" + thisRowKey).val((rkNum * parseFloat(bean.estimatePurchasePrice)).toFixed(2));
 					return false;
 				}
 			});
 		} else {
-			$("#unitPrice" + thisRowNum).val("0.00");//重置单价为空
-			$("#amountOfMoney" + thisRowNum).val("0.00");//重置金额为空
+			// 重置单价以及金额为空
+			$("#unitPrice" + thisRowKey).val("0.00");
+			$("#amountOfMoney" + thisRowKey).val("0.00");
 		}
 
-		//加载库存
-		loadTockByDepotAndMUnit(thisRowNum, "");
-		//计算价格
+		// 加载库存
+		loadTockByDepotAndMUnit(thisRowKey, "");
+		// 计算价格
 		calculatedTotalPrice();
 	});
 
@@ -172,48 +202,34 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
-		//获取已选商品数据
-		var rowTr = $("#useTable tr");
-		if(rowTr.length == 0) {
-			winui.window.msg('请选择商品.', {icon: 2, time: 2000});
+	function saveData(subType, approvalId) {
+		var result = initTableChooseUtil.getDataList('productList');
+		if (!result.checkResult) {
 			return false;
 		}
-		var tableData = new Array();
-		var noError = false; //循环遍历表格数据时，是否有其他错误信息
-		$.each(rowTr, function(i, item) {
+		var noError = false;
+		var tableData = [];
+		$.each(result.dataList, function(i, item) {
 			//获取行编号
-			var rowNum = $(item).attr("trcusid").replace("tr", "");
-			//表格数量对象
-			var rkNum = $("#rkNum" + rowNum);
-			if(parseInt(rkNum.val()) == 0) {
-				rkNum.addClass("layui-form-danger");
-				rkNum.focus();
+			var thisRowKey = item["trcusid"].replace("tr", "");
+			if (parseInt(item.rkNum) == 0) {
+				$("#rkNum" + thisRowKey).addClass("layui-form-danger");
+				$("#rkNum" + thisRowKey).focus();
 				winui.window.msg('数量不能为0', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
 			//商品对象
-			var product = allChooseProduct["tr" + rowNum.toString()];
-			if(inTableDataArrayByAssetarId(product.productId, $("#unitId" + rowNum).val(), tableData)) {
+			var product = allChooseProduct["tr" + thisRowKey];
+			if (inTableDataArrayByAssetarId(product.productId, item.mUnitId, tableData)) {
 				winui.window.msg('一张单中不允许出现相同单位的商品信息.', {icon: 2, time: 2000});
 				noError = true;
 				return false;
 			}
-			var row = {
-				materialId: product.productId,
-				mUnitId: $("#unitId" + rowNum).val(),
-				rkNum: rkNum.val(),
-				unitPrice: $("#unitPrice" + rowNum).val(),
-				taxRate: $("#taxRate" + rowNum).val(),
-				taxMoney: $("#taxMoney" + rowNum).val(),
-				taxUnitPrice: $("#taxUnitPrice" + rowNum).val(),
-				taxLastMoney: $("#taxLastMoney" + rowNum).val(),
-				remark: $("#remark" + rowNum).val()
-			};
-			tableData.push(row);
+			item["materialId"] = product.productId;
+			tableData.push(item);
 		});
-		if(noError) {
+		if (noError) {
 			return false;
 		}
 
@@ -241,58 +257,6 @@ layui.config({
 		}});
 	}
 
-	//新增行
-	$("body").on("click", "#addRow", function() {
-		addRow();
-	});
-
-	//删除行
-	$("body").on("click", "#deleteRow", function() {
-		deleteRow();
-		//计算价格
-		calculatedTotalPrice();
-	});
-
-	//新增行
-	function addRow() {
-		var par = {
-			id: "row" + rowNum.toString(), //checkbox的id
-			trId: "tr" + rowNum.toString(), //行的id
-			materialId: "materialId" + rowNum.toString(), //商品id
-			unitId: "unitId" + rowNum.toString(), //规格id
-			currentTock: "currentTock" + rowNum.toString(), //库存id
-			rkNum: "rkNum" + rowNum.toString(), //数量id
-			unitPrice: "unitPrice"  + rowNum.toString(), //单价id
-			amountOfMoney: "amountOfMoney"  + rowNum.toString(), //金额id
-			taxRate: "taxRate"  + rowNum.toString(), //税率id
-			taxMoney: "taxMoney"  + rowNum.toString(), //税额id
-			taxUnitPrice: "taxUnitPrice"  + rowNum.toString(), //含税单价id
-			taxLastMoney: "taxLastMoney"  + rowNum.toString(), //含税合计id
-			remark: "remark" + rowNum.toString() //备注id
-		};
-		$("#useTable").append(getDataUseHandlebars(usetableTemplate, par));
-		form.render();
-		rowNum++;
-		//设置根据某列变化的颜色
-		$("." + showTdByEdit).parent().css({'background-color': '#e6e6e6'});
-	}
-
-	//删除行
-	function deleteRow() {
-		var checkRow = $("#useTable input[type='checkbox'][name='tableCheckRow']:checked");
-		if(checkRow.length > 0) {
-			$.each(checkRow, function(i, item) {
-				//删除allChooseProduct已选择的商品信息
-				var trId = $(item).parent().parent().attr("trcusid");
-				allChooseProduct[trId] = undefined;
-				//移除界面上的信息
-				$(item).parent().parent().remove();
-			});
-		} else {
-			winui.window.msg('请选择要删除的行', {icon: 2, time: 2000});
-		}
-	}
-
 	// 供应商选择
 	$("body").on("click", "#supplierNameSel", function (e) {
 		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
@@ -300,64 +264,58 @@ layui.config({
 		});
 	});
 
-	//商品选择
+	// 商品选择
 	$("body").on("click", ".chooseProductBtn", function (e) {
 		var trId = $(this).parent().parent().attr("trcusid");
 		erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
-			//获取表格行号
-			var thisRowNum = trId.replace("tr", "");
-			//商品赋值
+			// 获取表格行号
+			var thisRowKey = trId.replace("tr", "");
+			// 商品赋值
 			allChooseProduct[trId] = chooseProductMation;
-			//表格商品名称赋值
-			$("#materialId" + thisRowNum.toString()).val(allChooseProduct[trId].productName + "(" + allChooseProduct[trId].productModel + ")");
-			//表格单位赋值
-			$("#unitId" + thisRowNum.toString()).html(getDataUseHandlebars(selOption, {rows: allChooseProduct[trId].unitList}));
+			// 表格商品名称赋值
+			$("#materialId" + thisRowKey.toString()).val(chooseProductMation.productName + "(" + chooseProductMation.productModel + ")");
+			// 表格单位赋值
+			$("#mUnitId" + thisRowKey.toString()).html(getDataUseHandlebars(selOption, {rows: chooseProductMation.unitList}));
 			form.render('select');
 			//计算价格
 			calculatedTotalPrice();
 		});
 	});
 
-	//生产计划单选择
+	// 生产计划单选择
 	$("body").on("click", "#productionOrderSel", function (e) {
 		_openNewWindows({
 			url: "../../tpl/erpProduction/erpProductionNoSuccessChoose.html",
 			title: "选择生产计划单",
 			pageId: "erpProductionNoSuccessChoose",
 			area: ['90vw', '90vh'],
-			callBack: function(refreshCode){
+			callBack: function(refreshCode) {
 				$("#productionOrder").val(productionMation.defaultNumber);
-				//移除之前填写的所有行
-				var checkRow = $("#useTable input[type='checkbox'][name='tableCheckRow']");
-				$.each(checkRow, function(i, item) {
-					//删除allChooseProduct已选择的商品信息
-					var trId = $(item).parent().parent().attr("trcusid");
-					allChooseProduct[trId] = undefined;
-					//移除界面上的信息
-					$(item).parent().parent().remove();
-				});
-				$.each(productionMation.norms, function(i, item){
-					addRow();
-					//将规格所属的商品信息加入到对象中存储
-					allChooseProduct["tr" + (rowNum - 1)] = item.product;
-					//单位回显
-					$("#unitId" + (rowNum - 1)).html(getDataUseHandlebars(selOption, {rows: item.product.unitList}));
-					$("#unitId" + (rowNum - 1)).val(item.normsId);
-					//商品回显
-					$("#materialId" + (rowNum - 1)).val(item.product.productName + "(" + item.product.productModel + ")");
-					$("#currentTock" + (rowNum - 1)).html(item.currentTock);//库存回显
-					$("#rkNum" + (rowNum - 1)).val(item.needNum);
-					$("#unitPrice" + (rowNum - 1)).val(item.unitPrice.toFixed(2));
-					$("#amountOfMoney" + (rowNum - 1)).val(item.allPrice.toFixed(2));
-					$("#taxRate" + (rowNum - 1)).val(item.taxRate.toFixed(2));
-					$("#taxMoney" + (rowNum - 1)).val(item.taxMoney.toFixed(2));
-					$("#taxUnitPrice" + (rowNum - 1)).val(item.taxUnitPrice.toFixed(2));
-					$("#taxLastMoney" + (rowNum - 1)).val(item.taxLastMoney.toFixed(2));
+				initTableChooseUtil.deleteAllRow('productList');
+				$.each(productionMation.norms, function(i, item) {
+					var params = {
+						"materialId": item.product.productName + "(" + item.product.productModel + ")",
+						"mUnitId": {
+							"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
+							"value": item.normsId
+						},
+						"currentTock": item.currentTock,
+						"rkNum": item.needNum,
+						"unitPrice": item.unitPrice.toFixed(2),
+						"amountOfMoney": item.allPrice.toFixed(2),
+						"taxRate": item.taxRate.toFixed(2),
+						"taxMoney": item.taxMoney.toFixed(2),
+						"taxUnitPrice": item.taxUnitPrice.toFixed(2),
+						"taxLastMoney": item.taxLastMoney.toFixed(2)
+					};
+					var trcusid = initTableChooseUtil.resetData('productList', params);
+					// 将规格所属的商品信息加入到对象中存储
+					allChooseProduct[trcusid] = item.product;
 				});
-				//渲染
+				// 渲染
 				form.render();
 
-				//计算价格
+				// 计算价格
 				calculatedTotalPrice();
 			}});
 	});

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

@@ -182,7 +182,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -118,7 +118,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -194,7 +194,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -120,7 +120,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -189,7 +189,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -167,7 +167,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -227,7 +227,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -165,7 +165,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -225,7 +225,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		//获取已选商品数据
 		var rowTr = $("#useTable tr");
 		if(rowTr.length == 0) {

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

@@ -111,7 +111,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

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

@@ -194,7 +194,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

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

@@ -199,7 +199,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

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

@@ -121,7 +121,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

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

@@ -206,7 +206,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

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

@@ -123,7 +123,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

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

@@ -206,7 +206,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		if(isNull(customerMation.id)){
 			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
 			return false;

erp/src/main/resources/template/tpl/purchaseorder/purchaseorderedit.html

@@ -40,8 +40,8 @@
 			</div>
 		    <div class="layui-form-item layui-col-xs12">
 		        <label class="layui-form-label">列表项<i class="red">*</i></label>
-		        <div class="layui-input-block">
-		        	<div class="winui-toolbar">
+		        <div class="layui-input-block" id="productList">
+		        	<!-- todo 待验证删除 <div class="winui-toolbar">
 				        <div class="winui-tool" style="text-align: left;">
 				            <button id="addRow" class="winui-toolbtn" type="button"><i class="fa fa-plus" aria-hidden="true"></i>新增行</button>
 				            <button id="deleteRow" class="winui-toolbtn" type="button"><i class="fa fa-trash-o" aria-hidden="true"></i>删除行</button>
@@ -66,7 +66,7 @@
 		                </thead>
 		                <tbody id="useTable" class="insurance-table">
 		                </tbody>
-					</table>
+					</table>-->
 		        </div>
 		    </div>
 		    <div class="layui-form-item layui-col-xs4">
@@ -148,7 +148,7 @@
 	    </form>
 	</div>
 	
-	<!-- usetableTemplate -->
+	<!--  todo 待验证删除 usetableTemplate
 	<script type="text/x-handlebars-template" id="usetableTemplate">
 		<tr trcusid="{{trId}}">
 			<td><input type="checkbox" rowId="{{id}}" lay-filter="checkboxProperty" name="tableCheckRow"/></td>
@@ -167,7 +167,7 @@
 			<td><input type="text" class="layui-input change-input taxLastMoney" id="{{taxLastMoney}}" win-verify="required|money"/></td>
 			<td><input type="text" class="layui-input" id="{{remark}}"/></td>
 		</tr>
-	</script>
+	</script> -->
 	
 	<script src="../../assets/lib/layui/layui.js"></script>
    	<script src="../../assets/lib/layui/custom.js"></script>

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

@@ -66,7 +66,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         var result = voucherUtil.getData();
         if(result.length < 2){
             return false;

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

@@ -135,7 +135,7 @@ layui.config({
         return false;
     });
 
-    function saveData(subType, approvalId){
+    function saveData(subType, approvalId) {
         var result = voucherUtil.getData();
         if(result.length < 2){
             return false;

pro/src/main/resources/template/js/procostexpense/procostexpenseadd.js

@@ -85,7 +85,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取数据
 		var rowTr = $("#useTable tr");
 		var tableData = new Array();

pro/src/main/resources/template/js/procostexpense/procostexpenseedit.js

@@ -106,7 +106,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		// 获取数据
 		var rowTr = $("#useTable tr");
 		var tableData = new Array();

pro/src/main/resources/template/js/profile/profileadd.js

@@ -44,7 +44,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			title: $("#title").val(),
 			typeId: $("#fileType").val(),

pro/src/main/resources/template/js/profile/profileedit.js

@@ -75,7 +75,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			rowId: parent.rowId,
 			title: $("#title").val(),

pro/src/main/resources/template/js/proproject/proprojectadd.js

@@ -108,7 +108,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			projectName: $("#projectName").val(),
 			projectNumber: $("#projectNumber").val(),

pro/src/main/resources/template/js/proproject/proprojectedit.js

@@ -142,7 +142,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			rowId: parent.rowId,
 			projectName: $("#projectName").val(),

pro/src/main/resources/template/js/protask/protaskadd.js

@@ -86,7 +86,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			taskName: $("#taskName").val(),
 			taskType: $("#taskType").val(),

pro/src/main/resources/template/js/protask/protaskedit.js

@@ -141,7 +141,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var params = {
 			rowId: parent.rowId,
 			taskName: $("#taskName").val(),

pro/src/main/resources/template/js/proworkload/proworkloadadd.js

@@ -158,7 +158,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var rowTr = $("#useTable tr");
 		var tableData = new Array();
 		$.each(rowTr, function(i, item) {

pro/src/main/resources/template/js/proworkload/proworkloadedit.js

@@ -197,7 +197,7 @@ layui.config({
 		return false;
 	});
 
-	function saveData(subType, approvalId){
+	function saveData(subType, approvalId) {
 		var rowTr = $("#useTable tr");
 		var tableData = new Array();
 		$.each(rowTr, function(i, item) {

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

@@ -20,6 +20,7 @@ var initTableChooseUtil = {
         deleteRowCallback: function () {trcusid}, // 删除行之后的回调函数
         addRowCallback: function (trcusid) {}, // 新增行之后的回调函数
         form: null, // form表单对象
+        minData: 0, // 允许的最小数据数
     }, // 表格参数数据
 
     /**
@@ -169,7 +170,7 @@ var initTableChooseUtil = {
     getDataList: function (tableDivId) {
         // 获取配置
         var options = initTableChooseUtil.setting[tableDivId];
-        var result = [];
+        var dataList = [];
         var rowTr = $("#table" + tableDivId + " tr");
         $.each(rowTr, function (i, item) {
             var trcusid = $(item).attr("trcusid");
@@ -189,9 +190,18 @@ var initTableChooseUtil = {
                 }
                 row[bean.id] = value;
             });
-            result.push(row);
+            dataList.push(row);
         });
-        return result;
+        var checkResult = true;
+        if (dataList.length < options.minData) {
+            checkResult = false;
+            winui.window.msg('请最少填写' + options.minData + '条信息', {icon: 2, time: 2000});
+        }
+
+        return {
+            checkResult: checkResult,
+            dataList: dataList
+        };
     },
 
     /**