Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1280
Star 158
Fork 129
S
Skyeye
提交 94526089 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

【ERP】零售退货商品选择整改完成

上级 dd52c393
隐藏空白更改
内联 并排
Showing with 178 addition and 414 deletion
erp/src/main/resources/template/js/retailoutlet/retailoutletadd.js
浏览文件 @ 94526089
......@@ -32,13 +32,11 @@ layui.config({
// 初始化账户
systemCommonUtil.getSysAccountListByType(function (json) {
// 加载账户数据
$("#accountId").html(getDataUseHandlebars(selOption, json));
});
// 初始化仓库
erpOrderUtil.getDepotList(function (json){
// 加载仓库数据
$("#depotId").html(getDataUseHandlebars(selOption, json));
});
......
erp/src/main/resources/template/js/retailoutlet/retailoutletedit.js
浏览文件 @ 94526089
......@@ -20,13 +20,13 @@ layui.config({
var showTdByEdit = 'rkNum';//根据那一列的值进行变化,默认根据数量
var beanTemplate = $("#beanTemplate").html();
var selOption = getFileContent('tpl/template/select-option.tpl');
//已经选择的商品集合key：表格的行trId，value：商品信息
// 已经选择的商品集合key：表格的行trId，value：商品信息
var allChooseProduct = {};
// 获取单据提交类型
var submitType = "";
//加载单据数据
// 加载单据数据
var orderObject = [];
showGrid({
id: "showForm",
......@@ -139,7 +139,7 @@ layui.config({
}
// 商品规格加载变化事件
mUnitChangeEvent(form, allChooseProduct, "retailPrice");
mUnitChangeEvent(form, allChooseProduct, "retailPrice", calculatedTotalPrice);
// 仓库变化事件
form.on('select(depotId)', function(data) {
......@@ -293,7 +293,7 @@ layui.config({
initChooseProductBtnEnent(form, function(trId, chooseProductMation) {
// 商品赋值
allChooseProduct[trId] = chooseProductMation;
});
}, calculatedTotalPrice);
// 会员选择
$("body").on("click", ".chooseMemberBtn", function (e) {
......
erp/src/main/resources/template/js/retailreturns/retailreturnsadd.js
浏览文件 @ 94526089
......@@ -2,6 +2,7 @@
// 兼容动态表单
var layedit, form;
// 零售退货
layui.config({
base: basePath,
version: skyeyeVersion
......@@ -17,11 +18,8 @@ layui.config({
layedit = layui.layedit,
form = layui.form;
var rowNum = 1; //表格的序号
var usetableTemplate = $("#usetableTemplate").html();
var selOption = getFileContent('tpl/template/select-option.tpl');
//已经选择的商品集合key：表格的行trId，value：商品信息
// 已经选择的商品集合key：表格的行trId，value：商品信息
var allChooseProduct = {};
// 获取单据提交类型
......@@ -34,47 +32,46 @@ layui.config({
// 初始化账户
systemCommonUtil.getSysAccountListByType(function (json) {
// 加载账户数据
$("#accountId").html(getDataUseHandlebars(selOption, json));
});
// 初始化仓库
erpOrderUtil.getDepotList(function (json){
// 加载仓库数据
$("#depotId").html(getDataUseHandlebars(selOption, json));
// 初始化一行数据
addRow();
});
// 商品
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
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["putIsRetailReturns"]["code"], null);
matchingLanguage();
//商品规格加载变化事件
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.retailPrice.toFixed(2));//单价
$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.retailPrice)).toFixed(2));//金额
return false;
}
});
} else {
$("#unitPrice" + thisRowNum).val("0.00");//重置单价为空
$("#amountOfMoney" + thisRowNum).val("0.00");//重置金额为空
}
//加载库存
loadTockByDepotAndMUnit(thisRowNum, $("#depotId").val());
//计算价格
calculatedTotalPrice();
});
// 商品规格加载变化事件
mUnitChangeEvent(form, allChooseProduct, "retailPrice", calculatedTotalPrice);
// 仓库变化事件
form.on('select(depotId)', function(data) {
......@@ -82,7 +79,7 @@ layui.config({
});
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 ", "");
......@@ -100,7 +97,7 @@ layui.config({
calculatedTotalPrice();
});
//收款金额变化
// 收款金额变化
$("body").on("input", "#changeAmount", function() {
calculatedTotalPrice();
});
......@@ -108,32 +105,31 @@ layui.config({
calculatedTotalPrice();
});
//计算总价
// 计算总价
function calculatedTotalPrice(){
var rowTr = $("#useTable tr");
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());
$.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" + rowNum).val((rkNum * unitPrice).toFixed(2));
// 输出金额
$("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2));
}else if("unitPrice" === showTdByEdit){//单价
//输出金额
$("#amountOfMoney" + rowNum).val((rkNum * unitPrice).toFixed(2));
// 输出金额
$("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2));
}else if("amountOfMoney" === showTdByEdit){//金额
//输出单价
$("#unitPrice" + rowNum).val((amountOfMoney / rkNum).toFixed(2));
// 输出单价
$("#unitPrice" + thisRowKey).val((amountOfMoney / rkNum).toFixed(2));
}
allPrice += parseFloat($("#amountOfMoney" + rowNum).val());
allPrice += parseFloat($("#amountOfMoney" + thisRowKey).val());
});
//获取收款金额
// 获取收款金额
var changeAmount = parseFloat(isNull($("#changeAmount").val()) ? "0" : $("#changeAmount").val());
$("#allPrice").html(allPrice.toFixed(2));
$("#giveChange").html((changeAmount - allPrice).toFixed(2));
......@@ -166,44 +162,34 @@ layui.config({
});
function saveData(subType, approvalId) {
//获取已选商品数据
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; //循环遍历表格数据时，是否有其他错误信息
$.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: $("#depotId").val(),
materialId: $("#materialId" + rowNum).val(),
mUnitId: $("#unitId" + rowNum).val(),
rkNum: rkNum.val(),
unitPrice: $("#unitPrice" + 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;
}
......@@ -227,83 +213,11 @@ layui.config({
}, async: true});
}
//判断选中的商品是否也在数组中
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", ".chooseMemberBtn", function (e) {
......
erp/src/main/resources/template/js/retailreturns/retailreturnsedit.js
浏览文件 @ 94526089
......@@ -17,18 +17,16 @@ layui.config({
layedit = layui.layedit,
form = layui.form;
var rowNum = 1; //表格的序号
var usetableTemplate = $("#usetableTemplate").html();
var showTdByEdit = 'rkNum';//根据那一列的值进行变化,默认根据数量
var beanTemplate = $("#beanTemplate").html();
var selOption = getFileContent('tpl/template/select-option.tpl');
//已经选择的商品集合key：表格的行trId，value：商品信息
// 已经选择的商品集合key：表格的行trId，value：商品信息
var allChooseProduct = {};
// 获取单据提交类型
var submitType = "";
//加载单据数据
// 加载单据数据
var orderObject = [];
showGrid({
id: "showForm",
......@@ -50,10 +48,12 @@ layui.config({
systemCommonUtil.getSysAccountListByType(function (json) {
$("#accountId").html(getDataUseHandlebars(selOption, json));
});
// 初始化仓库
erpOrderUtil.getDepotList(function (json){
$("#depotId").html(getDataUseHandlebars(selOption, json));
});
// 渲染数据到页面
initDataToShow();
}
......@@ -65,29 +65,38 @@ layui.config({
id: orderObject.bean.organId,
contacts: orderObject.bean.supplierName
};
$("#memberId").val(sysMemberUtil.memberMation.contacts);//会员
$("#accountId").val(orderObject.bean.accountId);//账户
$("#payType").val(orderObject.bean.payType);//付款类型
//渲染列表项
$.each(orderObject.bean.norms, function(i, item){
addRow();
if(i == 0){
initTable();
// 回显商品列表
initTableChooseUtil.deleteAllRow('productList');
$.each(orderObject.bean.norms, function(i, item) {
if (i == 0) {
$("#depotId").val(item.depotId);
}
//将规格所属的商品信息加入到对象中存储
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));//金额回显
$("#remark" + (rowNum - 1)).val(item.remark);//备注回显
//设置标识
$("tr[trcusid='tr" + (rowNum - 1) + "']").attr("thisid", item.id);
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[trcusid] = item.product;
});
erpOrderUtil.orderEditPageSetBtnBySubmitType(submitType, orderObject.bean.state);
......@@ -101,40 +110,43 @@ layui.config({
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.retailPrice.toFixed(2));//单价
$("#amountOfMoney" + thisRowNum).val((rkNum * parseFloat(bean.retailPrice)).toFixed(2));//金额
return false;
}
});
} else {
$("#unitPrice" + thisRowNum).val("0.00");//重置单价为空
$("#amountOfMoney" + 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: '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'});
calculatedTotalPrice();
},
form: form,
minData: 1
});
}
//加载库存
loadTockByDepotAndMUnit(thisRowNum, $("#depotId").val());
//计算价格
calculatedTotalPrice();
});
// 商品规格加载变化事件
mUnitChangeEvent(form, allChooseProduct, "retailPrice", 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 ", "");
......@@ -160,32 +172,31 @@ layui.config({
calculatedTotalPrice();
});
//计算总价
// 计算总价
function calculatedTotalPrice(){
var rowTr = $("#useTable tr");
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());
$.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" + rowNum).val((rkNum * unitPrice).toFixed(2));
// 输出金额
$("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2));
}else if("unitPrice" === showTdByEdit){//单价
//输出金额
$("#amountOfMoney" + rowNum).val((rkNum * unitPrice).toFixed(2));
// 输出金额
$("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2));
}else if("amountOfMoney" === showTdByEdit){//金额
//输出单价
$("#unitPrice" + rowNum).val((amountOfMoney / rkNum).toFixed(2));
// 输出单价
$("#unitPrice" + thisRowKey).val((amountOfMoney / rkNum).toFixed(2));
}
allPrice += parseFloat($("#amountOfMoney" + rowNum).val());
allPrice += parseFloat($("#amountOfMoney" + thisRowKey).val());
});
//获取收款金额
// 获取收款金额
var changeAmount = parseFloat(isNull($("#changeAmount").val()) ? "0" : $("#changeAmount").val());
$("#allPrice").html(allPrice.toFixed(2));
$("#giveChange").html((changeAmount - allPrice).toFixed(2));
......@@ -226,45 +237,34 @@ layui.config({
});
function saveData(subType, approvalId) {
//获取已选商品数据
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; //循环遍历表格数据时，是否有其他错误信息
$.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: $("#depotId").val(),
materialId: $("#materialId" + rowNum).val(),
mUnitId: $("#unitId" + rowNum).val(),
rkNum: rkNum.val(),
unitPrice: $("#unitPrice" + rowNum).val(),
thisId: isNull($(item).attr("thisid")) ? "" : $(item).attr("thisid"),
remark: $("#remark" + rowNum).val()
};
tableData.push(row);
item["materialId"] = product.productId;
item["depotId"] = $("#depotId").val();
tableData.push(item);
});
if(noError) {
if (noError) {
return false;
}
......@@ -289,83 +289,11 @@ layui.config({
}, async: true});
}
//判断选中的商品是否也在数组中
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", ".chooseMemberBtn", function (e) {
......
erp/src/main/resources/template/tpl/retailreturns/retailreturnsadd.html
浏览文件 @ 94526089
......@@ -51,29 +51,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: 150px;">商品(型号)</th>
<th style="width: 50px;">单位</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-xs4">
......@@ -114,23 +93,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><input type="text" class="layui-input change-input rkNum" value="1" 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" id="{{remark}}"/></td>
</tr>
</script>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script src="../../js/erpcommon/loadStock.js"></script>
......
erp/src/main/resources/template/tpl/retailreturns/retailreturnsedit.html
浏览文件 @ 94526089
......@@ -13,23 +13,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><input type="text" class="layui-input change-input rkNum" value="1" 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" id="{{remark}}"/></td>
</tr>
</script>
<!-- beanTemplate -->
<script type="text/x-handlebars-template" id="beanTemplate">
{{#bean}}
......@@ -75,29 +58,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: 150px;">商品(型号)</th>
<th style="width: 50px;">单位</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-xs4">
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或