From 8d99ffc43f33c93f6690ffdb8e0ee102f93d4521 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sun, 14 Aug 2022 17:01:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ERP=E3=80=91=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E5=8D=95=E6=95=B4=E6=94=B9=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/allocation/allocationadd.js | 237 +++++--------- .../template/js/allocation/allocationedit.js | 293 +++++++----------- .../tpl/allocation/allocationadd.html | 44 +-- .../tpl/allocation/allocationedit.html | 44 +-- 4 files changed, 184 insertions(+), 434 deletions(-) diff --git a/erp/src/main/resources/template/js/allocation/allocationadd.js b/erp/src/main/resources/template/js/allocation/allocationadd.js index feb2d0606..99feaf681 100644 --- a/erp/src/main/resources/template/js/allocation/allocationadd.js +++ b/erp/src/main/resources/template/js/allocation/allocationadd.js @@ -12,11 +12,9 @@ layui.config({ var $ = layui.$, laydate = layui.laydate, textool = layui.textool; - var rowNum = 1; //表格的序号 - var usetableTemplate = $("#usetableTemplate").html(); var selOption = getFileContent('tpl/template/select-option.tpl'); - //已经选择的商品集合key：表格的行trId，value：商品信息 + // 已经选择的商品集合key：表格的行trId，value：商品信息 var allChooseProduct = {}; // 单据时间 @@ -28,47 +26,46 @@ layui.config({ erpOrderUtil.getDepotList(function (json){ // 加载仓库数据 $("#inDepotId").html(getDataUseHandlebars(selOption, json)); - $("#outDepotId").html(getDataUseHandlebars(selOption, json)); - // 初始化一行数据 - addRow(); - - matchingLanguage(); + $("#depotId").html(getDataUseHandlebars(selOption, json)); }); - //产品规格加载变化事件 - 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));//金额 - return false; - } - }); - } else { - $("#unitPrice" + thisRowNum).val("0.00");//重置单价为空 - $("#amountOfMoney" + thisRowNum).val("0.00");//重置金额为空 - } - - //加载库存 - loadTockByDepotAndMUnit(thisRowNum, $("#outDepotId").val()); - //计算价格 - calculatedTotalPrice(); + // 商品 + 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: 'remark', title: '备注', formType: 'input', width: '100'} + ], + deleteRowCallback: function (trcusid) { + delete allChooseProduct[trcusid]; + // 计算价格 + calculatedTotalPrice(); + }, + addRowCallback: function (trcusid) { + // 设置根据某列变化的颜色 + $("." + showTdByEdit).parent().css({'background-color': '#e6e6e6'}); + }, + form: form, + minData: 1 }); + matchingLanguage(); + + // 商品规格加载变化事件 + mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice", calculatedTotalPrice); + // 调出仓库变化事件 form.on('select(depotId)', function(data) { loadMaterialDepotStockByDepotId(data.value); }); var showTdByEdit = 'rkNum';//根据那一列的值进行变化,默认根据数量 - //数量变化 + // 数量变化 $("body").on("input", ".rkNum, .unitPrice, .amountOfMoney", function() { if($(this).attr("class").replace("layui-input change-input ", "") != showTdByEdit){ showTdByEdit = $(this).attr("class").replace("layui-input change-input ", ""); @@ -86,80 +83,64 @@ layui.config({ calculatedTotalPrice(); }); - //计算总价 - function calculatedTotalPrice(){ - var rowTr = $("#useTable tr"); + // 计算总价 + function calculatedTotalPrice() { var allPrice = 0; - $.each(rowTr, function(i, item) { - //获取行坐标 - var rowNum = $(item).attr("trcusid").replace("tr", ""); - //获取数量 - var rkNum = parseInt(isNull($("#rkNum" + rowNum).val()) ? "0" : $("#rkNum" + rowNum).val()); - //获取单价 - var unitPrice = parseFloat(isNull($("#unitPrice" + rowNum).val()) ? "0" : $("#unitPrice" + rowNum).val()); - //获取单价 - var amountOfMoney = parseFloat(isNull($("#amountOfMoney" + rowNum).val()) ? "0" : $("#amountOfMoney" + rowNum).val()); - if("rkNum" === showTdByEdit){//数量 - //输出金额 - $("#amountOfMoney" + rowNum).val((rkNum * unitPrice).toFixed(2)); - }else if("unitPrice" === showTdByEdit){//单价 - //输出金额 - $("#amountOfMoney" + rowNum).val((rkNum * unitPrice).toFixed(2)); - }else if("amountOfMoney" === showTdByEdit){//金额 - //输出单价 - $("#unitPrice" + rowNum).val((amountOfMoney / rkNum).toFixed(2)); + $.each(initTableChooseUtil.getDataRowIndex('productList'), function (i, item) { + // 获取行坐标 + var thisRowKey = item; + // 获取数量 + var rkNum = parseInt(isNull($("#rkNum" + thisRowKey).val()) ? "0" : $("#rkNum" + thisRowKey).val()); + // 获取单价 + var unitPrice = parseFloat(isNull($("#unitPrice" + thisRowKey).val()) ? "0" : $("#unitPrice" + thisRowKey).val()); + // 获取单价 + var amountOfMoney = parseFloat(isNull($("#amountOfMoney" + thisRowKey).val()) ? "0" : $("#amountOfMoney" + thisRowKey).val()); + if ("rkNum" === showTdByEdit) {//数量 + // 输出金额 + $("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2)); + } else if ("unitPrice" === showTdByEdit) {//单价 + // 输出金额 + $("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2)); + } else if ("amountOfMoney" === showTdByEdit) {//金额 + // 输出单价 + $("#unitPrice" + thisRowKey).val((amountOfMoney / rkNum).toFixed(2)); } - allPrice += parseFloat($("#amountOfMoney" + rowNum).val()); + allPrice += parseFloat($("#amountOfMoney" + thisRowKey).val()); }); $("#allPrice").html(allPrice.toFixed(2)); } form.on('submit(formAddBean)', function(data) { - if(winui.verifyForm(data.elem)) { - //获取已选商品数据 - var rowTr = $("#useTable tr"); - if(rowTr.length == 0) { - winui.window.msg('请选择商品.', {icon: 2, time: 2000}); - return false; - } - if($("#inDepotId").val() === $("#outDepotId").val()) { - winui.window.msg('调入仓库不能和调出仓库一致.', {icon: 2, time: 2000}); + 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 = { - depotId: $("#outDepotId").val(), - materialId: $("#materialId" + rowNum).val(), - mUnitId: $("#unitId" + rowNum).val(), - rkNum: rkNum.val(), - unitPrice: $("#unitPrice" + rowNum).val(), - anotherDepotId: $("#inDepotId").val(), - remark: $("#remark" + rowNum).val() - }; - tableData.push(row); + item["materialId"] = product.productId; + item["depotId"] = $("#depotId").val(); + item["anotherDepotId"] = $("#inDepotId").val(), + tableData.push(item); }); - if(noError) { + if (noError) { return false; } @@ -175,85 +156,13 @@ layui.config({ } return false; }); - - //判断选中的产品是否也在数组中 - function inTableDataArrayByAssetarId(materialId, unitId, array) { - var isIn = false; - $.each(array, function(i, item) { - if(item.mUnitId === unitId && item.materialId === materialId) { - isIn = true; - return false; - } - }); - return isIn; - } - - //新增行 - $("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 - remark: "remark" + rowNum.toString() //备注id - }; - $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); - form.render(); - rowNum++; - //设置根据某列变化的颜色 - $("." + showTdByEdit).parent().css({'background-color': '#e6e6e6'}); - } + // 加载商品选择事件 + initChooseProductBtnEnent(form, function(trId, chooseProductMation) { + // 商品赋值 + allChooseProduct[trId] = chooseProductMation; + }, calculatedTotalPrice); - //删除行 - 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", ".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(); - }); - }); - $("body").on("click", "#cancle", function() { parent.layer.close(index); }); diff --git a/erp/src/main/resources/template/js/allocation/allocationedit.js b/erp/src/main/resources/template/js/allocation/allocationedit.js index 3fd89149a..61e733dbb 100644 --- a/erp/src/main/resources/template/js/allocation/allocationedit.js +++ b/erp/src/main/resources/template/js/allocation/allocationedit.js @@ -12,15 +12,13 @@ layui.config({ var $ = layui.$, laydate = layui.laydate, textool = layui.textool; - var rowNum = 1; //表格的序号 - var usetableTemplate = $("#usetableTemplate").html(); var beanTemplate = $("#beanTemplate").html(); var selOption = getFileContent('tpl/template/select-option.tpl'); - //已经选择的商品集合key：表格的行trId，value：商品信息 + // 已经选择的商品集合key：表格的行trId，value：商品信息 var allChooseProduct = {}; - //加载单据数据 + // 加载单据数据 var orderObject = []; showGrid({ id: "showForm", @@ -39,72 +37,79 @@ layui.config({ // 初始化仓库 function initDepotHtml() { erpOrderUtil.getDepotList(function (json){ - // 加载仓库数据 $("#inDepotId").html(getDataUseHandlebars(selOption, json)); - $("#outDepotId").html(getDataUseHandlebars(selOption, json)); - // 渲染数据到页面 - initDataToShow(); + $("#depotId").html(getDataUseHandlebars(selOption, json)); }); + // 渲染数据到页面 + initDataToShow(); } - //渲染数据到页面 + // 渲染数据到页面 function initDataToShow(){ - //渲染列表项 - $.each(orderObject.bean.items, function(i, item){ - addRow(); - if(i == 0){ - $("#outDepotId").val(item.depotId); + initTable(); + + // 回显商品列表 + initTableChooseUtil.deleteAllRow('productList'); + $.each(orderObject.bean.items, function(i, item) { + if (i == 0) { + $("#depotId").val(item.depotId); $("#inDepotId").val(item.anotherDepotId); } - //将规格所属的商品信息加入到对象中存储 - allChooseProduct["tr" + (rowNum - 1)] = item.product; - //单位回显 - $("#unitId" + (rowNum - 1)).html(getDataUseHandlebars(selOption, {rows: item.product.unitList})); - $("#unitId" + (rowNum - 1)).val(item.mUnitId); - $("#materialTypeId" + (rowNum - 1)).val(item.mType);//产品类型回显 - //产品回显 - $("#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));//金额回显 - $("#remark" + (rowNum - 1)).val(item.remark);//备注回显 - //设置标识 - $("tr[trcusid='tr" + (rowNum - 1) + "']").attr("thisid", item.id); + var params = { + "materialType": { + "value": item.mType + }, + "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), + "remark": item.remark + }; + var trcusid = initTableChooseUtil.resetData('productList', params); + // 将规格所属的商品信息加入到对象中存储 + allChooseProduct[trcusid] = item.product; }); - + textool.init({eleId: 'remark', maxlength: 200}); matchingLanguage(); form.render(); } - - //产品规格加载变化事件 - 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));//金额 - return false; - } - }); - } else { - $("#unitPrice" + thisRowNum).val("0.00");//重置单价为空 - $("#amountOfMoney" + thisRowNum).val("0.00");//重置金额为空 - } - - //加载库存 - loadTockByDepotAndMUnit(thisRowNum, $("#outDepotId").val()); - //计算价格 - calculatedTotalPrice(); - }); + + 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: 'remark', title: '备注', formType: 'input', width: '100'} + ], + deleteRowCallback: function (trcusid) { + delete allChooseProduct[trcusid]; + // 计算价格 + calculatedTotalPrice(); + }, + addRowCallback: function (trcusid) { + // 设置根据某列变化的颜色 + $("." + showTdByEdit).parent().css({'background-color': '#e6e6e6'}); + }, + form: form, + minData: 1 + }); + } + + // 商品规格加载变化事件 + mUnitChangeEvent(form, allChooseProduct, "estimatePurchasePrice", calculatedTotalPrice); // 调出仓库变化事件 form.on('select(depotId)', function(data) { @@ -129,81 +134,65 @@ layui.config({ } calculatedTotalPrice(); }); - - //计算总价 - function calculatedTotalPrice(){ - var rowTr = $("#useTable tr"); + + // 计算总价 + function calculatedTotalPrice() { var allPrice = 0; - $.each(rowTr, function(i, item) { - //获取行坐标 - var rowNum = $(item).attr("trcusid").replace("tr", ""); - //获取数量 - var rkNum = parseInt(isNull($("#rkNum" + rowNum).val()) ? "0" : $("#rkNum" + rowNum).val()); - //获取单价 - var unitPrice = parseFloat(isNull($("#unitPrice" + rowNum).val()) ? "0" : $("#unitPrice" + rowNum).val()); - //获取单价 - var amountOfMoney = parseFloat(isNull($("#amountOfMoney" + rowNum).val()) ? "0" : $("#amountOfMoney" + rowNum).val()); - if("rkNum" === showTdByEdit){//数量 - //输出金额 - $("#amountOfMoney" + rowNum).val((rkNum * unitPrice).toFixed(2)); - }else if("unitPrice" === showTdByEdit){//单价 - //输出金额 - $("#amountOfMoney" + rowNum).val((rkNum * unitPrice).toFixed(2)); - }else if("amountOfMoney" === showTdByEdit){//金额 - //输出单价 - $("#unitPrice" + rowNum).val((amountOfMoney / rkNum).toFixed(2)); + $.each(initTableChooseUtil.getDataRowIndex('productList'), function (i, item) { + // 获取行坐标 + var thisRowKey = item; + // 获取数量 + var rkNum = parseInt(isNull($("#rkNum" + thisRowKey).val()) ? "0" : $("#rkNum" + thisRowKey).val()); + // 获取单价 + var unitPrice = parseFloat(isNull($("#unitPrice" + thisRowKey).val()) ? "0" : $("#unitPrice" + thisRowKey).val()); + // 获取单价 + var amountOfMoney = parseFloat(isNull($("#amountOfMoney" + thisRowKey).val()) ? "0" : $("#amountOfMoney" + thisRowKey).val()); + if ("rkNum" === showTdByEdit) {//数量 + // 输出金额 + $("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2)); + } else if ("unitPrice" === showTdByEdit) {//单价 + // 输出金额 + $("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2)); + } else if ("amountOfMoney" === showTdByEdit) {//金额 + // 输出单价 + $("#unitPrice" + thisRowKey).val((amountOfMoney / rkNum).toFixed(2)); } - allPrice += parseFloat($("#amountOfMoney" + rowNum).val()); + allPrice += parseFloat($("#amountOfMoney" + thisRowKey).val()); }); $("#allPrice").html(allPrice.toFixed(2)); } form.on('submit(formEditBean)', function(data) { if(winui.verifyForm(data.elem)) { - //获取已选商品数据 - 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; } - if($("#inDepotId").val() === $("#outDepotId").val()) { - winui.window.msg('调入仓库不能和调出仓库一致.', {icon: 2, time: 2000}); - 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 = { - depotId: $("#outDepotId").val(), - materialId: $("#materialId" + rowNum).val(), - mUnitId: $("#unitId" + rowNum).val(), - rkNum: rkNum.val(), - unitPrice: $("#unitPrice" + rowNum).val(), - anotherDepotId: $("#inDepotId").val(), - thisId: isNull($(item).attr("thisid")) ? "" : $(item).attr("thisid"), - remark: $("#remark" + rowNum).val() - }; - tableData.push(row); + item["materialId"] = product.productId; + item["depotId"] = $("#depotId").val(); + item["anotherDepotId"] = $("#inDepotId").val(), + tableData.push(item); }); - if(noError) { + if (noError) { return false; } @@ -220,84 +209,12 @@ layui.config({ } return false; }); - - //判断选中的产品是否也在数组中 - function inTableDataArrayByAssetarId(materialId, unitId, array) { - var isIn = false; - $.each(array, function(i, item) { - if(item.mUnitId === unitId && item.materialId === materialId) { - isIn = true; - return false; - } - }); - return isIn; - } - - //新增行 - $("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 - 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", ".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(); - }); - }); + // 加载商品选择事件 + initChooseProductBtnEnent(form, function(trId, chooseProductMation) { + // 商品赋值 + allChooseProduct[trId] = chooseProductMation; + }, calculatedTotalPrice); $("body").on("click", "#cancle", function() { parent.layer.close(index); diff --git a/erp/src/main/resources/template/tpl/allocation/allocationadd.html b/erp/src/main/resources/template/tpl/allocation/allocationadd.html index cacbb38fe..490f98785 100644 --- a/erp/src/main/resources/template/tpl/allocation/allocationadd.html +++ b/erp/src/main/resources/template/tpl/allocation/allocationadd.html @@ -18,7 +18,7 @@
-
@@ -33,29 +33,8 @@
-
-
-
- - -
-
- - - - - - - - - - - - - - - -
商品(型号)单位库存(调出仓库)数量单价金额备注
+
+
@@ -79,23 +58,6 @@
- - - diff --git a/erp/src/main/resources/template/tpl/allocation/allocationedit.html b/erp/src/main/resources/template/tpl/allocation/allocationedit.html index 7961f2330..7759c4460 100644 --- a/erp/src/main/resources/template/tpl/allocation/allocationedit.html +++ b/erp/src/main/resources/template/tpl/allocation/allocationedit.html @@ -13,23 +13,6 @@
- - -