Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1433
Star 162
Fork 130
S
Skyeye
提交 bc27ca22 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

【ERP】采购入库单数据选择整改

上级 0cbb3677
隐藏空白更改
内联 并排
Showing with 174 addition and 482 deletion
erp/src/main/resources/template/js/erpcommon/calculatePrice.js
浏览文件 @ bc27ca22
......@@ -247,6 +247,14 @@ layui.define(["jquery"], function(exports) {
$("#arrears").html((discountLastMoney - changeAmount).toFixed(2));
});
// 其他费用变化
$("body").on("input", ".otherPrice", function() {
calculationPrice();
});
$("body").on("change", ".otherPrice", function() {
calculationPrice();
});
})(jQuery);
});
......@@ -261,3 +269,14 @@ function inTableDataArrayByAssetarId(materialId, unitId, array) {
});
return isIn;
}
// 计算其他费用总价格
function calculationPrice(){
var allPrice = 0;
$.each(initTableChooseUtil.getDataRowIndex('otherPriceTableList'), function(i, item) {
// 获取行坐标
var thisRowKey = item;
allPrice += parseFloat(isNull($("#otherPrice" + thisRowKey).val()) ? 0 : $("#otherPrice" + thisRowKey).val());
});
$("#otherPriceTotal").html("费用合计：" + allPrice.toFixed(2));
}
erp/src/main/resources/template/js/erpcommon/loadStock.js
浏览文件 @ bc27ca22
......@@ -79,7 +79,7 @@ function getStockAjaxByDepotAndNormsId(normsIds, depotId, callBack) {
*
* @param form 表单对象
*/
function mUnitChangeEvent(form) {
function mUnitChangeEvent(form, allChooseProduct) {
// 商品规格加载变化事件
form.on('select(selectUnitProperty)', function(data) {
var thisRowValue = data.value;
......@@ -116,6 +116,7 @@ function mUnitChangeEvent(form) {
* @param callback 回调函数
*/
function initChooseProductBtnEnent (form, callback) {
var selOptionHtml = getFileContent('tpl/template/select-option.tpl');
$("body").on("click", ".chooseProductBtn", function (e) {
var trId = $(this).parent().parent().attr("trcusid");
erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
......@@ -124,7 +125,7 @@ function initChooseProductBtnEnent (form, callback) {
// 表格商品名称赋值
$("#materialId" + thisRowKey.toString()).val(chooseProductMation.productName + "(" + chooseProductMation.productModel + ")");
// 表格单位赋值
$("#mUnitId" + thisRowKey.toString()).html(getDataUseHandlebars(selOption, {rows: chooseProductMation.unitList}));
$("#mUnitId" + thisRowKey.toString()).html(getDataUseHandlebars(selOptionHtml, {rows: chooseProductMation.unitList}));
form.render('select');
if (typeof callback == "function") {
callback(trId, chooseProductMation);
......
erp/src/main/resources/template/js/purchaseorder/purchaseorderadd.js
浏览文件 @ bc27ca22
......@@ -78,7 +78,7 @@ layui.config({
matchingLanguage();
// 商品规格加载变化事件
mUnitChangeEvent(form);
mUnitChangeEvent(form, allChooseProduct);
// 保存为草稿
form.on('submit(formAddBean)', function(data) {
......
erp/src/main/resources/template/js/purchaseorder/purchaseorderedit.js
浏览文件 @ bc27ca22
......@@ -142,7 +142,7 @@ layui.config({
}
// 商品规格加载变化事件
mUnitChangeEvent(form);
mUnitChangeEvent(form, allChooseProduct);
// 保存为草稿
form.on('submit(formEditBean)', function(data) {
......
erp/src/main/resources/template/js/purchaseput/purchaseputadd.js
浏览文件 @ bc27ca22
......@@ -22,7 +22,6 @@ layui.config({
var inoutitemHtml = "";//支出项目
var otherTemplate = $("#otherTemplate").html();
var selOption = getFileContent('tpl/template/select-option.tpl');
//已经选择的商品集合key：表格的行trId，value：商品信息
var allChooseProduct = {};
......@@ -53,6 +52,7 @@ layui.config({
$("#depotId").html(getDataUseHandlebars(selOption, json));
});
// 商品
initTableChooseUtil.initTable({
id: "productList",
cols: [
......@@ -81,13 +81,29 @@ layui.config({
minData: 1
});
// 其他费用
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
});
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", sysDsFormWithCodeType["putIsPurchase"]["code"], null);
matchingLanguage();
// 商品规格加载变化事件
mUnitChangeEvent(form);
mUnitChangeEvent(form, allChooseProduct);
// 仓库变化事件
form.on('select(depotId)', function(data) {
......@@ -152,19 +168,11 @@ layui.config({
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 params = {
......@@ -178,7 +186,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),
submitType: submitType,
subType: subType,
approvalId: approvalId
......@@ -190,7 +198,6 @@ layui.config({
}});
}
/*********************** 商品表格操作 start ****************************/
// 供应商选择
$("body").on("click", "#supplierNameSel", function (e) {
sysSupplierUtil.openSysSupplierChoosePage(function (supplierMation){
......@@ -198,79 +205,11 @@ layui.config({
});
});
// 加载选品选择事件
initChooseProductBtnEnent(form, function(trId, chooseProductMation) {
// 商品赋值
allChooseProduct[trId] = chooseProductMation;
});
/*********************** 商品表格操作 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));
}
var priceNum = 1;
//新增行
$("body").on("click", "#addPriceRow", function() {
addPriceRow();
});
//删除行
$("body").on("click", "#deletePriceRow", function() {
deletePriceRow();
});
//新增行
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/js/purchaseput/purchaseputedit.js
浏览文件 @ bc27ca22
//根据那一列的值进行变化,默认根据数量
var showTdByEdit = 'rkNum';
//表格的序号
var rowNum = 1;
// 兼容动态表单
var layedit, form;
......@@ -24,8 +22,6 @@ layui.config({
var inoutitemHtml = "";//支出项目
var usetableTemplate = $("#usetableTemplate").html(),
otherTemplate = $("#otherTemplate").html();
var selOption = getFileContent('tpl/template/select-option.tpl');
//已经选择的商品集合key：表格的行trId，value：商品信息
var allChooseProduct = {};
......@@ -60,18 +56,12 @@ layui.config({
function initDataShow(){
AjaxPostUtil.request({url: flowableBasePath + "purchaseput003", params: {rowId: parent.rowId}, type: 'json', method: "GET", callback: function(json) {
submitType = json.bean.submitType;
// 供应商信息赋值
sysSupplierUtil.supplierMation = {
id: json.bean.organId,
supplierName: json.bean.supplierName
}
//如果关联订单号不为空，则隐藏添加行，禁止新增行
if(!isNull(json.bean.linkNumber)){
$("#addRow").hide();
}
$("#supplierName").val(json.bean.supplierName);//供应商
$("#operTime").val(json.bean.operTime);
$("#accountId").val(json.bean.accountId);
......@@ -86,38 +76,47 @@ layui.config({
$("#arrears").html(json.bean.arrears.toFixed(2));
$("#otherPriceTotal").html("费用合计：" + json.bean.otherMoney.toFixed(2));
//加载列表项
$.each(json.bean.norms, function(i, item){
addRow();
if(i == 0){
initTable();
// 回显商品列表
initTableChooseUtil.deleteAllRow('productList');
$.each(json.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));
$("#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);
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;
});
//加载其他费用
$.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);
});
erpOrderUtil.orderEditPageSetBtnBySubmitType(submitType, json.bean.state);
textool.init({eleId: 'remark', maxlength: 200});
......@@ -130,30 +129,55 @@ 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){//获取规格
//获取当前行数量
var rkNum = parseInt($("#rkNum" + thisRowNum).val());
$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.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: '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,
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);
// 仓库变化事件
form.on('select(depotId)', function(data) {
......@@ -195,63 +219,42 @@ 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(),
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 params = {
......@@ -265,7 +268,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),
subType: subType,
submitType: submitType,
approvalId: approvalId,
......@@ -278,59 +281,6 @@ 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
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){
......@@ -338,93 +288,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();
// 加载选品选择事件
initChooseProductBtnEnent(form, function(trId, chooseProductMation) {
// 商品赋值
allChooseProduct[trId] = chooseProductMation;
});
//计算其他费用总价格
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));
}
var priceNum = 1;
//新增行
$("body").on("click", "#addPriceRow", function() {
addPriceRow();
});
//删除行
$("body").on("click", "#deletePriceRow", function() {
deletePriceRow();
});
//新增行
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/purchaseput/purchaseputadd.html
浏览文件 @ bc27ca22
......@@ -36,32 +36,7 @@
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">列表项<i class="red">*</i></label>
<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>
</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="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>
</div>
<div class="layui-form-item layui-col-xs3">
......@@ -130,24 +105,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">
......@@ -164,36 +123,6 @@
</form>
</div>
<!-- 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>
<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 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>
......
erp/src/main/resources/template/tpl/purchaseput/purchaseputedit.html
浏览文件 @ bc27ca22
......@@ -35,33 +35,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="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">
......@@ -130,24 +105,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">
......@@ -165,36 +124,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 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>
......
web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js
浏览文件 @ bc27ca22
......@@ -16,6 +16,8 @@ var initTableChooseUtil = {
// verify: 'required|number',
// value: '默认值',
// valueKey: '回显时要展示数据里面的那个key',
// modelHtml: '当formType=select时，可以设定select的内容',
// colHeaderId: '可以指定所在列的header的id'
// layFilter: '可以方便指定监听事件'}
deleteRowCallback: function () {trcusid}, // 删除行之后的回调函数
addRowCallback: function (trcusid) {}, // 新增行之后的回调函数
......@@ -33,7 +35,7 @@ var initTableChooseUtil = {
winui.window.msg('id 不能为空', {icon: 2, time: 2000});
return false;
}
var newOptions = $.extend(true, initTableChooseUtil.options, _options);
var newOptions = $.extend(true, {}, initTableChooseUtil.options, _options);
initTableChooseUtil.setting[_options.id] = newOptions;
initTableChooseUtil.initTableHtml(newOptions);
initTableChooseUtil.initEvent(_options.id);
......@@ -60,7 +62,8 @@ var initTableChooseUtil = {
$("#" + newOptions.id).html(table);
var headerStr = '<th style="width: 30px;"></th>';
$.each(newOptions.cols, function (i, item) {
headerStr += '<th style="width: ' + item.width + 'px; white-space: nowrap;">' + item.title + '</th>';
var colHeaderId = isNull(item.colHeaderId) ? "" : ("id = " + item.colHeaderId);
headerStr += '<th style="width: ' + item.width + 'px; white-space: nowrap;" ' + colHeaderId + '>' + item.title + '</th>';
});
$("#header" + newOptions.id).html(headerStr);
},
......@@ -106,7 +109,8 @@ var initTableChooseUtil = {
tbodyStr += '<td><input type="text" class="layui-input ' + className + '" value="' + value + '" id="' + tdId + '" win-verify="' + verify + '" readonly="readonly"/>' +
'<i class="fa fa-plus-circle input-icon ' + item.iconClassName + '" style="top: 12px;"></i></td>';
} else if (item.formType == 'select') {
tbodyStr += '<td><select id="' + tdId + '" lay-filter="' + item.layFilter + '" lay-search win-verify="' + verify + '"></select></td>';
var modelHtml = isNull(item.modelHtml) ? "" : item.modelHtml;
tbodyStr += '<td><select id="' + tdId + '" lay-filter="' + item.layFilter + '" lay-search win-verify="' + verify + '">' + modelHtml + '</select></td>';
} else if (item.formType == 'detail') {
tbodyStr += '<td id="' + tdId + '" class="' + className + '"></td>';
}
......@@ -270,7 +274,9 @@ var initTableChooseUtil = {
} else if (formType == 'chooseInput') {
$("#" + tdId).val(value);
} else if (formType == 'select') {
$("#" + tdId).html(value["html"]);
if (!isNull(value["html"])) {
$("#" + tdId).html(value["html"]);
}
$("#" + tdId).val(value["value"]);
} else if (formType == 'detail') {
$("#" + tdId).html(value);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或