Skip to content

S
Skyeye

Skyeye云 / Skyeye

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

组件对象修改

上级 3f710e67
隐藏空白更改
内联 并排
Showing with 231 addition and 271 deletion
common/src/main/resources/template/js/dsFormPage/editPageContent.js
浏览文件 @ 31f7754b
......@@ -43,6 +43,12 @@ layui.config({
<input type="text" id="remark" name="remark" placeholder="请输入备注" class="layui-input" />
</div>
</div>`,
'classNameBox': `<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">class属性：</label>
<div class="layui-input-block winui-radio">
<input type="text" id="className" name="className" placeholder="请输入class属性" class="layui-input" />
</div>
</div>`,
'requireBox': `<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">限制条件</label>
<div class="layui-input-block" id="require">
......@@ -164,9 +170,15 @@ layui.config({
<button id="addRowCallbackConfig" type="button" class="winui-toolbtn writeScript">编写脚本</button>
</div>
</div>`,
'beforeScriptBox': `<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label" style="width: 70%;">组件加载前执行的JS：</label>
<div class="layui-input-block" script="layui.define(['jquery'], function(exports) {\n\tvar form = layui.form;\n\tvar contentId = '{{id}}';\n\n});">
<button id="beforeScriptConfig" type="button" class="winui-toolbtn writeScript">编写脚本</button>
</div>
</div>`,
'afterScriptBox': `<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label" style="width: 70%;">组件加载完成后执行的JS：</label>
<div class="layui-input-block" script="layui.define(['jquery'], function(exports) {\n\tvar form = layui.form;\n\n});">
<div class="layui-input-block" script="layui.define(['jquery'], function(exports) {\n\tvar form = layui.form;\n\tvar contentId = '{{id}}';\n\n});">
<button id="afterScriptConfig" type="button" class="winui-toolbtn writeScript">编写脚本</button>
</div>
</div>`,
......@@ -198,6 +210,7 @@ layui.config({
$("#title").val(data.title);
$("#placeholder").val(data.placeholder);
$("#remark").val(data.remark);
$("#className").val(data.className);
$("#defaultValue").val(data.defaultValue);
$("#uploadNum").val(data.uploadNum);
......@@ -265,7 +278,12 @@ layui.config({
$("#minData").val(data.minData);
$("#deleteRowCallbackConfig").parent().attr('script', data.deleteRowCallback);
$("#addRowCallbackConfig").parent().attr('script', data.addRowCallback);
$("#afterScriptConfig").parent().attr('script', data.afterScript);
if (!isNull(data.beforeScript)) {
$("#beforeScriptConfig").parent().attr('script', data.beforeScript);
}
if (!isNull(data.afterScript)) {
$("#afterScriptConfig").parent().attr('script', data.afterScript);
}
$("#afterHtmlConfig").parent().attr('script', data.afterHtml);
$("body").on("click", "#attrTransformTableListConfig", function() {
......@@ -314,6 +332,7 @@ layui.config({
newParams.title = $("#title").val();
newParams.placeholder = $("#placeholder").val();
newParams.remark = $("#remark").val();
newParams.className = $("#className").val();
newParams.require = isNull($('#require').attr('value')) ? [] : JSON.parse($('#require').attr('value'));
newParams.uploadDataType = isNull($('#uploadDataType').attr('value')) ? [] : JSON.parse($('#uploadDataType').attr('value'));
newParams.uploadNum = $("#uploadNum").val();
......@@ -335,6 +354,7 @@ layui.config({
newParams.minData = $("#minData").val();
newParams.deleteRowCallback = $("#deleteRowCallbackConfig").parent().attr('script');
newParams.addRowCallback = $("#addRowCallbackConfig").parent().attr('script');
newParams.beforeScript = $("#beforeScriptConfig").parent().attr('script');
newParams.afterScript = $("#afterScriptConfig").parent().attr('script');
newParams.afterHtml = $("#afterHtmlConfig").parent().attr('script');
......
erp/src/main/resources/template/js/erpcommon/calculatePrice.js
浏览文件 @ 31f7754b
// 计算总价
function calculatedTotalPrice() {
var allPrice = 0, taxLastMoneyPrice = 0;
$.each(initTableChooseUtil.getDataRowIndex('productList'), function (i, item) {
var totalAmount = 0, taxLastMoneyPrice = 0;
$.each(initTableChooseUtil.getDataRowIndex(tableId), function (i, item) {
// 获取行坐标
var thisRowKey = item;
// 获取数量
var rkNum = parseInt(isNull($("#rkNum" + thisRowKey).val()) ? 0 : $("#rkNum" + thisRowKey).val());
var operNumber = parseInt(isNull($("#operNumber" + thisRowKey).val()) ? 0 : $("#operNumber" + thisRowKey).val());
// 获取单价
var unitPrice = parseFloat(isNull($("#unitPrice" + thisRowKey).val()) ? 0 : $("#unitPrice" + thisRowKey).val());
// 获取税率
var taxRate = parseFloat(isNull($("#taxRate" + thisRowKey).val()) ? 0 : $("#taxRate" + thisRowKey).val()) / 100;
if ('rkNum' === showTdByEdit) {//数量
//输出金额
$("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2));
$("#allPrice" + thisRowKey).val((operNumber * unitPrice).toFixed(2));
//输出税额=数量*税率*单价
$("#taxMoney" + thisRowKey).val((rkNum * taxRate * unitPrice).toFixed(2));
$("#taxMoney" + thisRowKey).val((operNumber * taxRate * unitPrice).toFixed(2));
//输出含税单价
$("#taxUnitPrice" + thisRowKey).val((taxRate * unitPrice + unitPrice).toFixed(2));
//输出合计价税
$("#taxLastMoney" + thisRowKey).val((rkNum * taxRate * unitPrice + rkNum * unitPrice).toFixed(2));
$("#taxLastMoney" + thisRowKey).val((operNumber * taxRate * unitPrice + operNumber * unitPrice).toFixed(2));
} else if ('unitPrice' === showTdByEdit) {//单价
//输出金额
$("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2));
$("#allPrice" + thisRowKey).val((operNumber * unitPrice).toFixed(2));
//输出税额=数量*税率*单价
$("#taxMoney" + thisRowKey).val((rkNum * taxRate * unitPrice).toFixed(2));
$("#taxMoney" + thisRowKey).val((operNumber * taxRate * unitPrice).toFixed(2));
//输出含税单价
$("#taxUnitPrice" + thisRowKey).val((taxRate * unitPrice + unitPrice).toFixed(2));
//输出合计价税
$("#taxLastMoney" + thisRowKey).val((rkNum * taxRate * unitPrice + rkNum * unitPrice).toFixed(2));
$("#taxLastMoney" + thisRowKey).val((operNumber * taxRate * unitPrice + operNumber * unitPrice).toFixed(2));
} else if ('amountOfMoney' === showTdByEdit) {//金额
//获取金额
var amountOfMoney = parseFloat(isNull($("#amountOfMoney" + thisRowKey).val()) ? 0 : $("#amountOfMoney" + thisRowKey).val());
var allPrice = parseFloat(isNull($("#allPrice" + thisRowKey).val()) ? 0 : $("#allPrice" + thisRowKey).val());
//输出税额=金额*税率
$("#taxMoney" + thisRowKey).val((amountOfMoney * taxRate).toFixed(2));
$("#taxMoney" + thisRowKey).val((allPrice * taxRate).toFixed(2));
//输出单价,含税单价,合计价税
if (rkNum != 0) {
$("#unitPrice" + thisRowKey).val((amountOfMoney / rkNum).toFixed(2));
$("#taxUnitPrice" + thisRowKey).val((amountOfMoney / rkNum * taxRate + amountOfMoney / rkNum).toFixed(2));
$("#taxLastMoney" + thisRowKey).val((amountOfMoney * taxRate + amountOfMoney).toFixed(2));
if (operNumber != 0) {
$("#unitPrice" + thisRowKey).val((allPrice / operNumber).toFixed(2));
$("#taxUnitPrice" + thisRowKey).val((allPrice / operNumber * taxRate + allPrice / operNumber).toFixed(2));
$("#taxLastMoney" + thisRowKey).val((allPrice * taxRate + allPrice).toFixed(2));
} else {
$("#unitPrice" + thisRowKey).val('0.00');
$("#taxUnitPrice" + thisRowKey).val('0.00');
......@@ -46,33 +46,33 @@ function calculatedTotalPrice() {
}
} else if ('taxRate' === showTdByEdit) {//税率
//输出金额
$("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2));
$("#allPrice" + thisRowKey).val((operNumber * unitPrice).toFixed(2));
//输出税额=数量*税率*单价
$("#taxMoney" + thisRowKey).val((rkNum * taxRate * unitPrice).toFixed(2));
$("#taxMoney" + thisRowKey).val((operNumber * taxRate * unitPrice).toFixed(2));
//输出含税单价
$("#taxUnitPrice" + thisRowKey).val((taxRate * unitPrice + unitPrice).toFixed(2));
//输出合计价税
$("#taxLastMoney" + thisRowKey).val((rkNum * taxRate * unitPrice + rkNum * unitPrice).toFixed(2));
$("#taxLastMoney" + thisRowKey).val((operNumber * taxRate * unitPrice + operNumber * unitPrice).toFixed(2));
} else if ('taxMoney' === showTdByEdit) {//税额
//获取税额
var taxMoney = parseFloat(isNull($("#taxMoney" + thisRowKey).val()) ? 0 : $("#taxMoney" + thisRowKey).val());
//输出金额
$("#amountOfMoney" + thisRowKey).val((rkNum * unitPrice).toFixed(2));
$("#allPrice" + thisRowKey).val((operNumber * unitPrice).toFixed(2));
//获取金额
var amountOfMoney = parseFloat(isNull($("#amountOfMoney" + thisRowKey).val()) ? 0 : $("#amountOfMoney" + thisRowKey).val());
var allPrice = parseFloat(isNull($("#allPrice" + thisRowKey).val()) ? 0 : $("#allPrice" + thisRowKey).val());
//输出含税单价,合计价税,税率
if (rkNum != 0) {
if (operNumber != 0) {
if (unitPrice != 0) {
$("#taxUnitPrice" + thisRowKey).val((taxMoney / rkNum + unitPrice).toFixed(2));
$("#taxRate" + thisRowKey).val((taxMoney / unitPrice / rkNum * 100).toFixed(2));
$("#taxUnitPrice" + thisRowKey).val((taxMoney / operNumber + unitPrice).toFixed(2));
$("#taxRate" + thisRowKey).val((taxMoney / unitPrice / operNumber * 100).toFixed(2));
} else {
$("#taxUnitPrice" + thisRowKey).val('0.00');
$("#taxRate" + thisRowKey).val('0.00');
$("#unitPrice" + thisRowKey).val('0.00');
$("#amountOfMoney" + thisRowKey).val('0.00');
$("#allPrice" + thisRowKey).val('0.00');
}
if (amountOfMoney != 0) {
$("#taxLastMoney" + thisRowKey).val((amountOfMoney + taxMoney).toFixed(2));
if (allPrice != 0) {
$("#taxLastMoney" + thisRowKey).val((allPrice + taxMoney).toFixed(2));
} else {
$("#taxLastMoney" + thisRowKey).val('0.00');
}
......@@ -86,27 +86,26 @@ function calculatedTotalPrice() {
if (taxUnitPrice == 0) {
$("#taxLastMoney" + thisRowKey).val('0.00');
$("#unitPrice" + thisRowKey).val('0.00');
$("#amountOfMoney" + thisRowKey).val('0.00');
$("#allPrice" + thisRowKey).val('0.00');
$("#taxMoney" + thisRowKey).val('0.00');
$("#taxRate" + thisRowKey).val('0.00');
return;
}
//输出合计价税,税额,税率
if (unitPrice != 0) {
if (rkNum != 0) {
$("#taxLastMoney" + thisRowKey).val((taxUnitPrice * rkNum).toFixed(2));
$("#amountOfMoney" + thisRowKey).val((unitPrice * thisRowKey).toFixed(2));
if (operNumber != 0) {
$("#taxLastMoney" + thisRowKey).val((taxUnitPrice * operNumber).toFixed(2));
$("#allPrice" + thisRowKey).val((unitPrice * operNumber).toFixed(2));
} else {
$("#taxLastMoney" + thisRowKey).val('0.00');
$("#amountOfMoney" + thisRowKey).val('0.00');
$("#allPrice" + thisRowKey).val('0.00');
}
$("#taxMoney" + thisRowKey).val((taxUnitPrice - unitPrice).toFixed(2));
$("#taxRate" + thisRowKey).val(((taxUnitPrice / unitPrice - 1) * 100).toFixed(2));
} else {
$("#taxLastMoney" + thisRowKey).val('0.00');
$("#unitPrice" + thisRowKey).val('0.00');
$("#amountOfMoney" + thisRowKey).val('0.00');
$("#allPrice" + thisRowKey).val('0.00');
$("#taxMoney" + thisRowKey).val('0.00');
$("#taxRate" + thisRowKey).val('0.00');
}
......@@ -116,20 +115,20 @@ function calculatedTotalPrice() {
if (taxLastMoney == 0) {
$("#taxUnitPrice" + thisRowKey).val('0.00');
$("#unitPrice" + thisRowKey).val('0.00');
$("#amountOfMoney" + thisRowKey).val('0.00');
$("#allPrice" + thisRowKey).val('0.00');
$("#taxMoney" + thisRowKey).val('0.00');
$("#taxRate" + thisRowKey).val('0.00');
return;
}
//输出含税单价,税额,税率
if (rkNum != 0) {
if (operNumber != 0) {
if (unitPrice != 0) {
$("#taxUnitPrice" + thisRowKey).val((taxLastMoney / rkNum).toFixed(2));
$("#taxMoney" + thisRowKey).val((taxLastMoney / rkNum - unitPrice).toFixed(2));
$("#taxRate" + thisRowKey).val(((taxLastMoney / rkNum / unitPrice - 1) * 100).toFixed(2));
$("#amountOfMoney" + thisRowKey).val((unitPrice * rkNum).toFixed(2));
$("#taxUnitPrice" + thisRowKey).val((taxLastMoney / operNumber).toFixed(2));
$("#taxMoney" + thisRowKey).val((taxLastMoney / operNumber - unitPrice).toFixed(2));
$("#taxRate" + thisRowKey).val(((taxLastMoney / operNumber / unitPrice - 1) * 100).toFixed(2));
$("#allPrice" + thisRowKey).val((unitPrice * operNumber).toFixed(2));
} else {
$("#amountOfMoney" + thisRowKey).val('0.00');
$("#allPrice" + thisRowKey).val('0.00');
$("#taxMoney" + thisRowKey).val('0.00');
$("#taxUnitPrice" + thisRowKey).val('0.00');
$("#unitPrice" + thisRowKey).val('0.00');
......@@ -137,28 +136,24 @@ function calculatedTotalPrice() {
} else {
$("#taxUnitPrice" + thisRowKey).val('0.00');
$("#unitPrice" + thisRowKey).val('0.00');
$("#amountOfMoney" + thisRowKey).val('0.00');
$("#allPrice" + thisRowKey).val('0.00');
$("#taxMoney" + thisRowKey).val('0.00');
$("#taxRate" + thisRowKey).val('0.00');
}
}
allPrice += parseFloat($("#amountOfMoney" + thisRowKey).val());
totalAmount += parseFloat($("#allPrice" + thisRowKey).val());
taxLastMoneyPrice += parseFloat($("#taxLastMoney" + thisRowKey).val());
});
$("#allPrice").html(allPrice.toFixed(2));
$("#allPrice").html(totalAmount.toFixed(2));
$("#taxLastMoneyPrice").html(taxLastMoneyPrice.toFixed(2));
// 优惠率计算
var discount = parseFloat(isNull($("#discount").val()) ? 0 : $("#discount").val());
var discount = parseFloat(isNull($(".discount").val()) ? 0 : $(".discount").val());
// 输出优惠金额
var discountMoney = (taxLastMoneyPrice * discount / 100).toFixed(2);
$("#discountMoney").val(discountMoney);
$(".discountMoney").val(discountMoney);
// 输出优惠后的金额
$("#discountLastMoney").html((taxLastMoneyPrice - discountMoney).toFixed(2));
// 输出本次付款
$("#changeAmount").val((taxLastMoneyPrice - discountMoney).toFixed(2));
// 输出欠款金额
$("#arrears").html('0.00');
}
layui.define(["jquery"], function(exports) {
......@@ -185,69 +180,45 @@ layui.define(["jquery"], function(exports) {
});
// 优惠率变化
$("body").on("input", "#discount", function() {
$("body").on("input", ".discount", function() {
//获取价格合计
var taxLastMoneyPrice = parseFloat(isNull($("#taxLastMoneyPrice").html()) ? 0 : $("#taxLastMoneyPrice").html());
var discount = parseFloat(isNull($(this).val()) ? 0 : $(this).val());
//输出优惠金额
$("#discountMoney").val((taxLastMoneyPrice * discount / 100).toFixed(2));
$(".discountMoney").val((taxLastMoneyPrice * discount / 100).toFixed(2));
//输出优惠后的金额
$("#discountLastMoney").html((taxLastMoneyPrice - (taxLastMoneyPrice * discount / 100)).toFixed(2));
//输出本次付款
$("#changeAmount").val((taxLastMoneyPrice - (taxLastMoneyPrice * discount / 100)).toFixed(2));
});
$("body").on("change", "#discount", function() {
$("body").on("change", ".discount", function() {
//获取价格合计
var taxLastMoneyPrice = parseFloat(isNull($("#taxLastMoneyPrice").html()) ? 0 : $("#taxLastMoneyPrice").html());
var discount = parseFloat(isNull($(this).val()) ? 0 : $(this).val());
//输出优惠金额
$("#discountMoney").val((taxLastMoneyPrice * discount / 100).toFixed(2));
$(".discountMoney").val((taxLastMoneyPrice * discount / 100).toFixed(2));
//输出优惠后的金额
$("#discountLastMoney").html((taxLastMoneyPrice - (taxLastMoneyPrice * discount / 100)).toFixed(2));
//输出本次付款
$("#changeAmount").val((taxLastMoneyPrice - (taxLastMoneyPrice * discount / 100)).toFixed(2));
});
// 优惠金额变化
$("body").on("input", "#discountMoney", function() {
$("body").on("input", ".discountMoney", function() {
//获取价格合计
var taxLastMoneyPrice = parseFloat(isNull($("#taxLastMoneyPrice").html()) ? 0 : $("#taxLastMoneyPrice").html());
var discountMoney = parseFloat(isNull($(this).val()) ? 0 : $(this).val());
//输出优惠率
$("#discount").val((discountMoney / taxLastMoneyPrice * 100).toFixed(2));
$(".discount").val((discountMoney / taxLastMoneyPrice * 100).toFixed(2));
//输出优惠后的金额
$("#discountLastMoney").html((taxLastMoneyPrice - discountMoney).toFixed(2));
//输出本次付款
$("#changeAmount").val((taxLastMoneyPrice - discountMoney).toFixed(2));
});
$("body").on("change", "#discountMoney", function() {
$("body").on("change", ".discountMoney", function() {
//获取价格合计
var taxLastMoneyPrice = parseFloat(isNull($("#taxLastMoneyPrice").html()) ? 0 : $("#taxLastMoneyPrice").html());
var discountMoney = parseFloat(isNull($(this).val()) ? 0 : $(this).val());
//输出优惠率
$("#discount").val((discountMoney / taxLastMoneyPrice * 100).toFixed(2));
$(".discount").val((discountMoney / taxLastMoneyPrice * 100).toFixed(2));
//输出优惠后的金额
$("#discountLastMoney").html((taxLastMoneyPrice - discountMoney).toFixed(2));
//输出本次付款
$("#changeAmount").val((taxLastMoneyPrice - discountMoney).toFixed(2));
});
// 本次付款变化
$("body").on("input", "#changeAmount", function() {
//获取优惠后的金额
var discountLastMoney = parseFloat(isNull($("#discountLastMoney").html()) ? 0 : $("#discountLastMoney").html());
var changeAmount = parseFloat(isNull($("#changeAmount").val()) ? 0 : $("#changeAmount").val());
//输出欠款金额
$("#arrears").html((discountLastMoney - changeAmount).toFixed(2));
});
$("body").on("change", "#changeAmount", function() {
//获取优惠后的金额
var discountLastMoney = parseFloat(isNull($("#discountLastMoney").html()) ? 0 : $("#discountLastMoney").html());
var changeAmount = parseFloat(isNull($("#changeAmount").val()) ? 0 : $("#changeAmount").val());
//输出欠款金额
$("#arrears").html((discountLastMoney - changeAmount).toFixed(2));
});
// 其他费用变化
$("body").on("input", ".otherPrice", function() {
calculationPrice();
......
erp/src/main/resources/template/js/erpcommon/loadStock.js
浏览文件 @ 31f7754b
......@@ -90,15 +90,16 @@ function mUnitChangeEvent(form, allChooseProduct, unitPriceKey, calcPriceCallbac
// 商品规格加载变化事件
form.on('select(selectUnitProperty)', function(data) {
var thisRowValue = data.value;
var thisRowKey = data.elem.id.replace("mUnitId", "").toString();
var thisRowKey = data.elem.id.replace("normsId", "").toString();
// 当前当前行选中的商品信息
if (!isNull(thisRowValue)) {
var product = allChooseProduct["tr" + thisRowKey];
$.each(product.unitList, function (j, bean) {
console.log(product)
$.each(product.materialNorms, function (j, bean) {
if (thisRowValue == bean.id) {
var rkNum = parseInt($("#rkNum" + thisRowKey).val());
// 设置单价和金额
var unitPrice = bean[unitPriceKey].toFixed(2);
var unitPrice = parseFloat(bean[unitPriceKey]).toFixed(2);
$("#unitPrice" + thisRowKey).val(unitPrice);
$("#amountOfMoney" + thisRowKey).val((rkNum * parseFloat(unitPrice)).toFixed(2));
return false;
......@@ -135,10 +136,11 @@ function initChooseProductBtnEnent (form, callback, calcPriceCallback) {
erpOrderUtil.openMaterialChooseChoosePage(function (chooseProductMation) {
// 获取表格行号
var thisRowKey = trId.replace("tr", "");
// 表格商品名称赋值
$("#materialId" + thisRowKey.toString()).val(chooseProductMation.materialName + "(" + chooseProductMation.materialModel + ")");
// 表格单位赋值
$("#mUnitId" + thisRowKey.toString()).html(getDataUseHandlebars(selOptionHtml, {rows: chooseProductMation.unitList}));
// 产品名称赋值
$("#materialId" + thisRowKey).val(chooseProductMation.name + "(" + chooseProductMation.model + ")");
$("#materialId" + thisRowKey).attr(initTableChooseUtil.chooseInputDataIdKey, chooseProductMation.id);
// 规格赋值
$("#normsId" + thisRowKey).html(getDataUseHandlebars(selOptionHtml, {rows: chooseProductMation.materialNorms}));
form.render('select');
if (typeof callback == "function") {
callback(trId, chooseProductMation);
......
erp/src/main/resources/template/js/material/materialChoose.js
浏览文件 @ 31f7754b
......@@ -47,7 +47,7 @@ layui.config({
tableCheckBoxUtil.init({
gridId: 'messageTable',
filterId: 'messageTable',
fieldName: 'materialId',
fieldName: 'id',
ids: ids
});
}
......@@ -56,45 +56,82 @@ layui.config({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'material010',
url: sysMainMation.erpBasePath + 'material010',
where: getTableParams(),
even: true,
page: true,
limits: [8, 16, 24, 32, 40, 48, 56],
limit: 8,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ type: checkType == '1' ? 'radio' : 'checkbox'},
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'materialName', title: '商品名称', align: 'left', width: 150 },
{ field: 'materialModel', title: '型号', align: 'left', width: 150 },
{ field: 'categoryName', title: '所属类型', align: 'left', width: 100 },
{ field: 'typeName', title: '商品来源', align: 'left', width: 100 },
{ field: 'name', title: '商品名称', align: 'left', width: 150 },
{ field: 'model', title: '型号', align: 'left', width: 150 },
{ field: 'categoryId', title: '所属分类', align: 'center', width: 100, templet: function (d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("ERP_MATERIAL_CATEGORY", d.categoryId);
}},
{ field: 'fromType', title: '产品来源', align: 'center', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialFromType", 'id', d.fromType, 'name');
}},
{ field: 'type', title: '产品类型', align: 'left', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialType", 'id', d.type, 'name');
}},
{ field: 'unit', title: '产品规格类型', align: 'center', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("materialUnit", 'id', d.unit, 'name');
}},
{ field: 'allStock', title: '当前库存', align: 'left', width: 200, templet: function (d) {
var str = "";
$.each(d.materialNorms, function(i, item) {
if (!isNull(item.overAllStock)) {
str += '<span class="layui-badge layui-bg-blue">' + item.name + '【' + item.overAllStock.allStock + '】</span><br>';
} else {
str += '<span class="layui-badge layui-bg-blue">' + item.name + '【0】</span><br>';
}
});
return str;
}}
]],
done: function(json, curr, count) {
matchingLanguage();
if(checkType == '1'){
for (var i = 0; i < json.rows.length; i++) {
// 未启用设置为不可选中
if (json.rows[i].enabled != 1) {
systemCommonUtil.disabledRow(json.rows[i].LAY_TABLE_INDEX, 'radio');
}
}
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){
var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
dubClick.find("input[type='radio']").prop("checked", true);
form.render();
var chooseIndex = JSON.stringify(dubClick.data('index'));
var obj = json.rows[chooseIndex];
parent.erpOrderUtil.chooseProductMation = obj;
parent.refreshCode = '0';
parent.layer.close(index);
if (!dubClick.find("input[type='radio']").prop("disabled")) {
dubClick.find("input[type='radio']").prop("checked", true);
form.render();
var chooseIndex = JSON.stringify(dubClick.data('index'));
var obj = json.rows[chooseIndex];
parent.erpOrderUtil.chooseProductMation = obj;
parent.refreshCode = '0';
parent.layer.close(index);
}
});
$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){
var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
click.find("input[type='radio']").prop("checked", true);
form.render();
if (!click.find("input[type='radio']").prop("disabled")) {
click.find("input[type='radio']").prop("checked", true);
form.render();
}
})
} else {
for (var i = 0; i < json.rows.length; i++) {
// 未启用设置为不可选中
if (json.rows[i].enabled != 1) {
systemCommonUtil.disabledRow(json.rows[i].LAY_TABLE_INDEX, 'checkbox');
}
}
// 多选
tableCheckBoxUtil.checkedDefault({
gridId: 'messageTable',
fieldName: 'materialId'
fieldName: 'id'
});
}
......
erp/src/main/resources/template/js/purchaseOrder/purchaseOrderList.js
浏览文件 @ 31f7754b
......@@ -6,60 +6,51 @@ layui.config({
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate', 'soulTable'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
laydate = layui.laydate,
soulTable = layui.soulTable,
table = layui.table;
var serviceClassName = sysServiceMation["purchaseOrder"]["key"];
authBtn('1571812723211');//新增
authBtn('1571986566776');//导出
laydate.render({elem: '#operTime', range: '~'});
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'purchaseorder001',
url: sysMainMation.erpBasePath + 'purchaseorder001',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
overflow: {
type: 'tips',
hoverTime: 300, // 悬停时间，单位ms, 悬停 hoverTime 后才会显示，默认为 0
minWidth: 150, // 最小宽度
maxWidth: 500 // 最大宽度
},
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'defaultNumber', title: '单据编号', rowspan: '2', align: 'left', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.defaultNumber + '</a>';
}},
{ field: 'supplierName', title: '供应商', rowspan: '2', align: 'left', width: 150 },
{ title: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', rowspan: '2', align: 'left', width: 80, templet: function (d) {
return activitiUtil.showStateName(d.state, d.submitType);
}},
{ field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120},
{ field: 'operPersonName', title: '操作人', rowspan: '2', align: 'left', width: 120},
{ field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 200, toolbar: '#tableBar'}
],[
{ field: 'submitType', title: '提交模式', align: 'left', width: 120, templet: function (d) {
return erpOrderUtil.getSubmitTypeName(d);
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'holderMation', title: '供应商', align: 'left', width: 150, templet: function (d) {
return d.holderMation.name;
}},
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 140 },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
}},
{ field: 'processInstanceId', title: '流程实例id', align: 'left', width: 120, templet: function (d) {
return erpOrderUtil.getProcessInstanceIdBySubmitType(d);
}}
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
]],
done: function(json) {
matchingLanguage();
soulTable.render(this);
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
......@@ -67,18 +58,20 @@ layui.config({
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'delete') { //删除
deleteOrder(data);
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'submitToSave') { //提交
subExamine(data);
} else if (layEvent === 'subExamine') { //提交审核
subExamine(data);
} else if (layEvent === 'subApproval') { //提交审核
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'turnPurchase') { //转采购入库单
turnPurchase(data);
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
......@@ -87,11 +80,24 @@ layui.config({
}
});
//编辑
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2023042000001', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "purchaseOrderAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 编辑
function edit(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/purchaseOrder/purchaseOrderEdit.html",
url: systemCommonUtil.getUrl('FP2023042000002&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "purchaseOrderEdit",
area: ['90vw', '90vh'],
......@@ -101,13 +107,6 @@ layui.config({
}});
}
// 删除
function deleteOrder(data) {
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
}
// 详情
function details(data) {
rowId = data.id;
......@@ -120,13 +119,6 @@ layui.config({
}});
}
// 提交数据
function subExamine(data) {
erpOrderUtil.submitOrderMation(data.id, serviceClassName, data.submitType, serviceClassName, function() {
loadTable();
});
}
// 转采购入库
function turnPurchase(data) {
rowId = data.id;
......@@ -141,59 +133,17 @@ layui.config({
}});
}
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/purchaseOrder/purchaseOrderAdd.html",
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "purchaseOrderAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 搜索表单
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()})
}
return false;
});
$("body").on("click", "#reloadTable", function() {
loadTable();
});
// 刷新
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
var startTime = "";
var endTime = "";
if (!isNull($("#operTime").val())) {
startTime = $("#operTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#operTime").val().split('~')[1].trim() + ' 23:59:59';
}
return {
defaultNumber: $("#defaultNumber").val(),
startTime: startTime,
endTime: endTime
};
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
// 导出excel
$("body").on("click", "#downloadExcel", function () {
postDownLoadFile({
url : flowableBasePath + 'purchaseorder010',
params: getTableParams(),
method : 'post'
});
});
exports('purchaseOrderList', {});
});
erp/src/main/resources/template/tpl/material/materialChoose.html
浏览文件 @ 31f7754b
......@@ -5,6 +5,15 @@
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
<style>
.layui-table-cell {
height: auto;
text-overflow: inherit;
overflow: visible;
white-space: normal;
word-wrap: break-word;
}
</style>
</head>
<body>
<div class="winui-tip alert-info" id="showInfo">
......
erp/src/main/resources/template/tpl/purchaseOrder/purchaseOrderList.html
浏览文件 @ 31f7754b
......@@ -7,75 +7,37 @@
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
<form class="layui-form layui-form-pane" action="" autocomplete="off">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">单据编号</label>
<div class="layui-input-inline">
<input type="text" id="defaultNumber" name="defaultNumber" placeholder="请输入单据编号" class="layui-input" />
</div>
<label class="layui-form-label">单据日期</label>
<div class="layui-input-inline">
<input type="text" id="operTime" name="operTime" placeholder="请选择单据日期" class="layui-input" />
</div>
<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
</div>
</div>
</form>
</div>
<div class="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="addBean" class="winui-toolbtn" auth="1571812723211"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
<button id="downloadExcel" class="winui-toolbtn" auth="1571986566776"><i class="fa fa-download" aria-hidden="true"></i><language showName="com.skyeye.exportExcel"></language></button>
</div>
<div class="winui-tool" style="text-align: left;">
<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1596958747047"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
<!-- 单据提交类型 1.走工作流提交 2.直接提交-->
{{# if(d.submitType == 1){ }}
{{# if(d.editRow == '1'){ }}
{{# if(auth('1571812753921')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subExamine">提交审核</a>
{{# } }}
{{# if(auth('1571812733324')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
<script type="text/html" id="tableBar">
{{# if(d.editRow == 1){ }}
{{# if(auth('1571812753921')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(d.editRow == '1' || d.editRow == '2'){ }}
{{# if(auth('1571812744641')){ }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1596958747047')){ }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(d.editRow == '2'){ }}
{{# if(auth('1629386145750')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# if(auth('1571812733324')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# } else if(d.submitType == 2) { }}
{{# if(d.state == 0){ }}
{{# if(auth('1571812744641')){ }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1571812733324')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# if(auth('1571812753921')){ }}
<a class="layui-btn layui-btn-xs" lay-event="submitToSave">提交</a>
{{# } }}
{{# } }}
{{# if(d.editRow == 2){ }}
{{# if(auth('1629386145750')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
{{# if(d.state == 2) { }}
{{# if(d.state == 'pass') { }}
{{# if(auth('1571812784641')){ }}
<a class="layui-btn layui-btn-xs" lay-event="turnPurchase">转采购入库</a>
{{# } }}
{{# } }}
</script>
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
......
ifs/src/main/resources/template/js/account/accountItem.js
浏览文件 @ 31f7754b
......@@ -15,12 +15,12 @@ layui.config({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'account008',
url: sysMainMation.ifsBasePath + 'account008',
where: {rowId:parent.rowId},
even: true,
page: true,
limits: [8, 16, 24, 32, 40, 48, 56],
limit: 8,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'defaultNumber', title: '单据编号', align: 'left', width: 250, templet: function (d) {
......
web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js
浏览文件 @ 31f7754b
......@@ -1082,6 +1082,9 @@ var dataShowType = {
layui.define(["xmSelect"], function(exports) {
var xmSelect = layui.xmSelect;
var data = [].concat(json.rows);
$.each(data, function (i, item) {
item.selected = false;
});
// 设置选中值
var chooseId = [];
if (!isNull(defaultId)) {
......
web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
浏览文件 @ 31f7754b
......@@ -324,10 +324,13 @@ var dsFormUtil = {
var html = getDataUseHandlebars('{{#bean}}' + component.htmlContent + '{{/bean}}', jsonStr);
var html_js = getDataUseHandlebars('{{#bean}}' + component.jsContent + '{{/bean}}', jsonStr);
var jsCon = `<script id="script${content.id}">${html_js}</script>`;
var beforeScript = getDataUseHandlebars('{{#bean}}' + content.beforeScript + '{{/bean}}', jsonStr);
$("#" + boxId).append(`<script>${beforeScript}</script>`);
$("#" + boxId).append(html + jsCon);
// 组件加载完成后执行的HTML和JS
$("#" + boxId).append(content.afterHtml);
$("#" + boxId).append(`<script>${content.afterScript}</script>`);
var afterScript = getDataUseHandlebars('{{#bean}}' + content.afterScript + '{{/bean}}', jsonStr);
$("#" + boxId).append(`<script>${afterScript}</script>`);
if (!isNull(content.require)) {
dsFormUtil.setIsRequired(content);
......
web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js
浏览文件 @ 31f7754b
......@@ -4,6 +4,8 @@ var initTableChooseUtil = {
setting: {}, // 支出多个一个页面多个配置文件的加载
chooseInputDataIdKey: "data-id",
options: {
id: "", // 表格加载的位置
indexRow: 0, // 表格行计数器
......@@ -198,7 +200,7 @@ var initTableChooseUtil = {
} else if (bean.formType == 'detail') {
value = $("#" + tdId).html();
} else if (bean.formType == 'chooseInput') {
value = $("#" + tdId).attr("data-id");
value = $("#" + tdId).attr(initTableChooseUtil.chooseInputDataIdKey);
}
row[bean.id] = value;
});
......@@ -285,7 +287,7 @@ var initTableChooseUtil = {
if (formType == 'input') {
$("#" + tdId).val(value);
} else if (formType == 'chooseInput') {
$("#" + tdId).attr("data-id", value);
$("#" + tdId).attr(initTableChooseUtil.chooseInputDataIdKey, value);
var key = dsFormUtil.getKeyIdToMation(bean.id);
value = data[key];
if (!isNull(value)) {
......
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ 31f7754b
......@@ -6,6 +6,7 @@
"isUsed": {"name": "是否使用的枚举", "className": "skyeye-pro#com.skyeye.common.enumeration.IsUsedEnum"},
"whetherEnum": {"name": "是否的枚举", "className": "skyeye-pro#com.skyeye.common.enumeration.WhetherEnum"},
"dateTimeType": {"name": "日期类型", "className": "skyeye-pro#com.skyeye.dsform.classenum.DateTimeType"},
"payTypeEnum": {"name": "付款类型", "className": "skyeye-pro#com.skyeye.common.enumeration.PayTypeEnum"},
"bossInterviewArrangementState": {"name": "面试安排状态枚举类", "className": "skyeye-boss#com.skyeye.arrangement.classenum.ArrangementState"},
"bossInterviewArrangementState1": {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或