【ERP】销售订单转销售出库修改

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

@@ -234,7 +234,7 @@ layui.config({
 				noError = true;
 				return false;
 			}
-			if(parseInt($("#rkNum" + thisRowKey).val()) > parseInt($("#nowNum" + thisRowKey).html())){
+			if (parseInt($("#rkNum" + thisRowKey).val()) > parseInt($("#nowNum" + thisRowKey).html())) {
 				isStandard = true;
 			}
 
@@ -278,8 +278,8 @@ layui.config({
 			subType: subType,
 			approvalId: approvalId
 		};
-		if(isStandard){
-			layer.confirm('该入库单已超出采购单数量，是否继续？', { icon: 3, title: '超标提示' }, function (i) {
+		if (isStandard) {
+			layer.confirm('该入库单已超出采购单数量，是否继续？', {icon: 3, title: '超标提示'}, function (i) {
 				sendRequest(params);
 			});
 		} else {
@@ -287,7 +287,7 @@ layui.config({
 		}
 	}
 
-	function sendRequest(params){
+	function sendRequest(params) {
 		AjaxPostUtil.request({url: flowableBasePath + "purchaseorder009", params: params, type: 'json', method: "POST", callback: function(json) {
 			dsFormUtil.savePageData("dsFormShow", json.bean.id);
 			parent.layer.close(index);
@@ -297,7 +297,7 @@ layui.config({
 
 	// 供应商选择
 	$("body").on("click", "#supplierNameSel", function (e) {
-		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
+		sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation) {
 			$("#supplierName").val(supplierMation.supplierName);
 		});
 	});

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

 
-//已经选择的客户信息
+// 已经选择的客户信息
 var customerMation = {};
 
-//根据那一列的值进行变化,默认根据数量
+// 根据那一列的值进行变化,默认根据数量
 var showTdByEdit = 'rkNum';
-//表格的序号
-var rowNum = 1, priceNum = 1;
 
 // 兼容动态表单
 var layedit, form;
@@ -30,8 +28,6 @@ layui.config({
 
 	var xsddOrderNum = "";//销售订单编号
 
-	var usetableTemplate = $("#usetableTemplate").html(),
-		otherTemplate = $("#otherTemplate").html();
 	var selOption = getFileContent('tpl/template/select-option.tpl');
 	//已经选择的商品集合key：表格的行trId，value：商品信息
 	var allChooseProduct = {};
@@ -94,34 +90,46 @@ layui.config({
 			$("#arrears").html(json.bean.arrears.toFixed(2));
 			$("#otherPriceTotal").html("费用合计：" + json.bean.otherMoney.toFixed(2));
 
-			//加载列表项
-			$.each(json.bean.items, 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.mUnitId);
-				//商品回显
-				$("#materialId" + (rowNum - 1)).val(item.product.productName + "(" + item.product.productModel + ")");
-				$("#currentTock" + (rowNum - 1)).html(item.currentTock);
-				//订单剩余数量
-				$("#nowNum" + (rowNum - 1)).html(isNull(item.nowNumber) ? 0 : item.nowNumber);
-				$("#rkNum" + (rowNum - 1)).val(isNull(item.nowNumber) ? 0 : item.nowNumber);
-				$("#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);
+			initTable();
+
+			// 回显商品列表
+			initTableChooseUtil.deleteAllRow('productList');
+			$.each(json.bean.items, function(i, item) {
+				if (i == 0) {
+					$("#depotId").val(item.depotId);
+				}
+				var params = {
+					"materialId": item.product.productName + "(" + item.product.productModel + ")",
+					"mUnitId": {
+						"html": getDataUseHandlebars(selOption, {rows: item.product.unitList}),
+						"value": item.mUnitId
+					},
+					"currentTock": item.currentTock,
+					"rkNum": isNull(item.nowNumber) ? 0 : item.nowNumber,
+					"nowNum": isNull(item.nowNumber) ? 0 : item.nowNumber,
+					"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[trcusid] = item.product;
 			});
 
-			//加载其他费用
-			$.each(json.bean.otherMoneyList, function(i, item){
-				addPriceRow();
-				$("#inoutitemId" + (priceNum - 1)).val(item.inoutitemId);
-				$("#otherPrice" + (priceNum - 1)).val(parseFloat(item.otherPrice).toFixed(2));
+			// 回显其他费用
+			initTableChooseUtil.deleteAllRow('otherPriceTableList');
+			$.each(json.bean.otherMoneyList, function(i, item) {
+				var params = {
+					"inoutitemId": {
+						"value": item.inoutitemId
+					},
+					"otherPrice": parseFloat(item.otherPrice).toFixed(2)
+				};
+				initTableChooseUtil.resetData('otherPriceTableList', params);
 			});
 
 			var userNames = "";
@@ -145,28 +153,57 @@ layui.config({
 		}});
 	}
 
-	//商品规格加载变化事件
-	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){//获取规格
-					$("#unitPrice" + thisRowNum).val(bean.salePrice.toFixed(2));//单价
-					return false;
-				}
-			});
-		} else {
-			$("#unitPrice" + thisRowNum).val("0.00");//重置单价为空
-		}
+	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: 'nowNum', title: '待出库数量', formType: 'detail', width: '80'},
+				{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'});
+				calculatedTotalPrice();
+			},
+			form: form,
+			minData: 1
+		});
 
-		//加载库存
-		loadTockByDepotAndMUnit(thisRowNum, $("#depotId").val());
-		//计算价格
-		calculatedTotalPrice();
-	});
+		// 其他费用
+		initTableChooseUtil.initTable({
+			id: "otherPriceTableList",
+			cols: [
+				{id: 'inoutitemId', title: '支出项目', formType: 'select', width: '120', verify: 'required', modelHtml: inoutitemHtml},
+				{id: 'otherPrice', title: '费用合计：0.00', formType: 'input', width: '120', className: 'otherPrice', verify: 'required|money', colHeaderId: 'otherPriceTotal'}
+			],
+			deleteRowCallback: function (trcusid) {
+				calculationPrice();
+			},
+			addRowCallback: function (trcusid) {
+				calculationPrice();
+			},
+			form: form
+		});
+	}
+
+	// 商品规格加载变化事件
+	mUnitChangeEvent(form, allChooseProduct, "salePrice");
 
 	// 仓库变化事件
 	form.on('select(depotId)', function(data) {
@@ -200,71 +237,47 @@ layui.config({
 	});
 
 	function saveData(subType, approvalId) {
-		if(isNull(customerMation.id)){
-			winui.window.msg('请选择客户.', {icon: 2, time: 2000});
-			return false;
-		}
-		//获取已选商品数据
-		var rowTr = $("#useTable tr");
-		if(rowTr.length == 0) {
-			winui.window.msg('请选择商品.', {icon: 2, time: 2000});
+		var result = initTableChooseUtil.getDataList('productList');
+		if (!result.checkResult) {
 			return false;
 		}
-		var tableData = new Array();
-		var noError = false; //循环遍历表格数据时，是否有其他错误信息
+		var noError = false;
 		var isStandard = false;//判断是否超标
-		$.each(rowTr, function(i, item) {
+		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;
 			}
-			if(parseInt($("#rkNum" + rowNum).val()) > parseInt($("#nowNum" + rowNum).html())){
+			if (parseInt($("#rkNum" + thisRowKey).val()) > parseInt($("#nowNum" + thisRowKey).html())) {
 				isStandard = true;
 			}
+
 			//商品对象
-			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 = {
-				depotId: $("#depotId").val(),
-				materialId: $("#materialId" + rowNum).val(),
-				mUnitId: $("#unitId" + rowNum).val(),
-				rkNum: $("#rkNum" + rowNum).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;
+			item["depotId"] = $("#depotId").val();
+			tableData.push(item);
 		});
-		if(noError) {
+		if (noError) {
 			return false;
 		}
-		//获取其他费用
-		var rowPriceTr = $("#otherPriceTable tr");
-		var tablePriceData = new Array();
+
+		// 其他费用
+		var otherPriceResult = initTableChooseUtil.getDataList('otherPriceTableList');
 		var otherMoney = 0;
-		$.each(rowPriceTr, function(i, item) {
-			//获取行编号
-			var rowNum = $(item).attr("trcusid").replace("tr", "");
-			var row = {
-				inoutitemId: $("#inoutitemId" + rowNum).val(),
-				otherPrice: $("#otherPrice" + rowNum).val()
-			};
-			otherMoney += parseFloat(isNull($("#otherPrice" + rowNum).val()) ? 0 : $("#otherPrice" + rowNum).val());
-			tablePriceData.push(row);
+		$.each(otherPriceResult.dataList, function(i, item) {
+			otherMoney += parseFloat(isNull(item.otherPrice) ? 0 : item.otherPrice);
 		});
 
 		var salesMan = "";
@@ -283,7 +296,7 @@ layui.config({
 			changeAmount: isNull($("#changeAmount").val()) ? "0.00" : $("#changeAmount").val(),
 			depotheadStr: JSON.stringify(tableData),
 			otherMoney: otherMoney.toFixed(2),
-			otherMoneyList: JSON.stringify(tablePriceData),
+			otherMoneyList: JSON.stringify(otherPriceResult.dataList),
 			xsddOrderNum: xsddOrderNum,
 			rowId: parent.rowId,
 			salesMan: salesMan,
@@ -291,8 +304,8 @@ layui.config({
 			subType: subType,
 			approvalId: approvalId
 		};
-		if(isStandard){
-			layer.confirm('该出库单已超出销售单数量，是否继续？', { icon: 3, title: '超标提示' }, function (i) {
+		if (isStandard) {
+			layer.confirm('该出库单已超出销售单数量，是否继续？', {icon: 3, title: '超标提示'}, function (i) {
 				sendRequest(params)
 			});
 		} else {
@@ -308,7 +321,7 @@ layui.config({
 		}});
 	}
 
-	//人员选择
+	// 人员选择
 	$("body").on("click", "#toSalesManSelPeople", function (e) {
 		systemCommonUtil.userReturnList = [].concat(salesManList);
 		systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含
@@ -320,61 +333,7 @@ layui.config({
 		});
 	});
 
-/*********************** 商品表格操作 start ****************************/
-	//新增行
-	$("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
-			nowNum: "nowNum" + 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", "#customMationSel", function (e) {
 		_openNewWindows({
 			url: "../../tpl/customermanage/customerChoose.html",
@@ -386,93 +345,12 @@ layui.config({
 			}});
 	});
 
-	//商品选择
-	$("body").on("click", ".chooseProductBtn", function (e) {
-		var trId = $(this).parent().parent().attr("trcusid");
-		erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
-			//获取表格行号
-			var thisRowNum = 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}));
-			form.render('select');
-			//计算价格
-			calculatedTotalPrice();
-		});
-	});
-
-/*********************** 商品表格操作 end ****************************/
-
-/*********************** 其他费用表格操作 start ****************************/
-
-	//其他费用变化
-	$("body").on("input", ".otherPrice", function() {
-		//计算价格
-		calculationPrice();
-	});
-	$("body").on("change", ".otherPrice", function() {
-		//计算价格
-		calculationPrice();
-	});
-
-	//计算其他费用总价格
-	function calculationPrice(){
-		var rowTr = $("#otherPriceTable tr");
-		var allPrice = 0;
-		$.each(rowTr, function(i, item) {
-			//获取行坐标
-			var rowNum = $(item).attr("trcusid").replace("tr", "");
-			//获取
-			var otherPrice = parseFloat(isNull($("#otherPrice" + rowNum).val()) ? 0 : $("#otherPrice" + rowNum).val());
-			allPrice += otherPrice;
-		});
-		$("#otherPriceTotal").html("费用合计：" + allPrice.toFixed(2));
-	}
-
-	//新增行
-	$("body").on("click", "#addPriceRow", function() {
-		addPriceRow();
-	});
-
-	//删除行
-	$("body").on("click", "#deletePriceRow", function() {
-		deletePriceRow();
+	// 加载商品选择事件
+	initChooseProductBtnEnent(form, function(trId, chooseProductMation) {
+		// 商品赋值
+		allChooseProduct[trId] = chooseProductMation;
 	});
 
-	//新增行
-	function addPriceRow() {
-		var par = {
-			id: "row" + priceNum.toString(), //checkbox的id
-			trId: "tr" + priceNum.toString(), //行的id
-			inoutitemId: "inoutitemId" + priceNum.toString(), //支出项目id
-			otherPrice: "otherPrice" + priceNum.toString() //金额id
-		};
-		$("#otherPriceTable").append(getDataUseHandlebars(otherTemplate, par));
-		//赋值给支出项目
-		$("#" + "inoutitemId" + priceNum.toString()).html(inoutitemHtml);
-		form.render('select');
-		form.render('checkbox');
-		priceNum++;
-	}
-
-	//删除行
-	function deletePriceRow() {
-		var checkRow = $("#otherPriceTable input[type='checkbox'][name='tableCheckRow']:checked");
-		if(checkRow.length > 0) {
-			$.each(checkRow, function(i, item) {
-				$(item).parent().parent().remove();
-			});
-		} else {
-			winui.window.msg('请选择要删除的行', {icon: 2, time: 2000});
-		}
-		//计算价格
-		calculationPrice();
-	}
-/*********************** 其他费用表格操作 end ****************************/
-
 	$("body").on("click", "#cancle", function() {
 		parent.layer.close(index);
 	});

erp/src/main/resources/template/tpl/salesorder/salesorderpurchase.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="customName" name="customName" placeholder="请选择客户" class="layui-input" readonly="readonly"/>
+		            <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>
 		    </div>
@@ -38,34 +38,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="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>
-				        </div>
-				    </div>
-		            <table class="layui-table">
-		                <thead>
-		                    <tr>
-		                    	<th style="width: 30px;"></th>
-		                        <th style="width: 120px;">商品(型号)</th>
-		                        <th style="width: 70px;">单位</th>
-		                        <th style="width: 80px;">库存</th>
-		                        <th style="width: 80px;">待出库数量</th>
-		                        <th style="width: 80px;">数量</th>
-		                        <th style="width: 80px;">单价</th>
-		                        <th style="width: 80px;">金额</th>
-		                        <th style="width: 80px;">税率(%)</th>
-		                        <th style="width: 80px;">税额</th>
-		                        <th style="width: 80px;">含税单价</th>
-		                        <th style="width: 80px;">合计价税</th>
-		                        <th style="min-width: 100px;">备注</th>
-		                    </tr>
-		                </thead>
-		                <tbody id="useTable" class="insurance-table">
-		                </tbody>
-					</table>
+		        <div class="layui-input-block" id="productList">
+
 		        </div>
 		    </div>
 		    <div class="layui-form-item layui-col-xs3">
@@ -141,24 +115,8 @@
 		    </div>
 		    <div class="layui-form-item layui-col-xs12">
 		        <label class="layui-form-label">其他费用</label>
-		        <div class="layui-input-block">
-		            <div class="winui-toolbar">
-				        <div class="winui-tool" style="text-align: left;">
-				            <button id="addPriceRow" class="winui-toolbtn" type="button"><i class="fa fa-plus" aria-hidden="true"></i>新增行</button>
-				            <button id="deletePriceRow" class="winui-toolbtn" type="button"><i class="fa fa-trash-o" aria-hidden="true"></i>删除行</button>
-				        </div>
-				    </div>
-		            <table class="layui-table">
-		                <thead>
-		                    <tr>
-		                    	<th style="width: 30px;"></th>
-		                        <th style="width: 120px;">支出项目：</th>
-		                        <th id="otherPriceTotal" style="width: 120px;">费用合计：0.00</th>
-		                    </tr>
-		                </thead>
-		                <tbody id="otherPriceTable" class="insurance-table">
-		                </tbody>
-					</table>
+		        <div class="layui-input-block" id="otherPriceTableList">
+
 		        </div>
 		    </div>
 			<div id="dsFormShow">
@@ -175,36 +133,6 @@
 	    </form>
 	</div>
 	
-	<!-- usetableTemplate -->
-	<script type="text/x-handlebars-template" id="usetableTemplate">
-		<tr trcusid="{{trId}}">
-			<td><input type="checkbox" rowId="{{id}}" lay-filter="checkboxProperty" name="tableCheckRow"/></td>
-			<td><input type="text" id="{{materialId}}" name="{{materialId}}" placeholder="请选择商品" class="layui-input" readonly="readonly"/>
-		        <i class="fa fa-plus-circle input-icon chooseProductBtn" style="top: 12px;"></i>
-			</td>
-			<td><select id="{{unitId}}" lay-filter="selectUnitProperty" lay-search win-verify="required"></select></td>
-			<td id="{{currentTock}}"></td>
-			<td id="{{nowNum}}">0</td>
-			<td><input type="text" class="layui-input change-input rkNum" value="0" id="{{rkNum}}" win-verify="required|number"/></td>
-			<td><input type="text" class="layui-input change-input unitPrice" id="{{unitPrice}}" win-verify="required|money"/></td>
-			<td><input type="text" class="layui-input change-input amountOfMoney" id="{{amountOfMoney}}" win-verify="required|money"/></td>
-			<td><input type="text" class="layui-input change-input taxRate" value="0.00" id="{{taxRate}}" win-verify="required|double"/></td>
-			<td><input type="text" class="layui-input change-input taxMoney" id="{{taxMoney}}" win-verify="required|money"/></td>
-			<td><input type="text" class="layui-input change-input taxUnitPrice" id="{{taxUnitPrice}}" win-verify="required|money"/></td>
-			<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>
-	
-	<!-- otherTemplate -->
-	<script type="text/x-handlebars-template" id="otherTemplate">
-		<tr trcusid="{{trId}}">
-			<td><input type="checkbox" rowId="{{id}}" lay-filter="checkboxProperty" name="tableCheckRow"/></td>
-			<td><select id="{{inoutitemId}}" lay-search win-verify="required"></select></td>
-			<td><input type="text" class="layui-input otherPrice" id="{{otherPrice}}" win-verify="required||money"/></td>
-		</tr>
-	</script>
-	
 	<script src="../../assets/lib/layui/layui.js"></script>
    	<script src="../../assets/lib/layui/custom.js"></script>
    	<script src="../../js/erpcommon/calculatePrice.js"></script>