Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1283
Star 158
Fork 129
S
Skyeye
提交 85cef2d3 编写于 作者: L LAPTOP-NDCM9L6Q\王丽雅
浏览文件
操作

Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

上级 9e47720a 56f4dac8
隐藏空白更改
内联 并排
Showing with 717 addition and 159 deletion
admin-assistant/src/main/resources/template/js/assetManageUse/assetManageUseList.js
浏览文件 @ 85cef2d3
......@@ -45,7 +45,7 @@ layui.config({
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () {
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
......
admin-assistant/src/main/resources/template/js/assetReportManage/assetReportList.js
浏览文件 @ 85cef2d3
......@@ -40,7 +40,6 @@ layui.config({
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("assetReportState", 'id', d.state, 'name');
}},
{ field: 'state1', title: '入库状态', rowspan: '2', width: 90, templet: function (d) {
// return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("assetReportState", 'id', d.state, 'name');
if (isNull(d.state)) {
return '未入库';
} else {
......
admin-assistant/src/main/resources/template/tpl/assetReportManage/batchCopy.html
浏览文件 @ 85cef2d3
......@@ -21,7 +21,7 @@
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">状态<i class="red">*</i></label>
<div class="layui-input-block">
<select id="state" name="state" lay-filter="state" lay-search="">
<select id="state" name="state" lay-filter="state" lay-search="" win-verify="required|state">
<option value="">请选择</option>
<option value="unUse">未使用</option>
<option value="unPut">未入库</option>
......
erp-produce/src/main/resources/template/js/erpPick/erpPatchPickList.js
浏览文件 @ 85cef2d3
......@@ -38,7 +38,7 @@ layui.config({
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name');
......
erp-produce/src/main/resources/template/js/erpPick/erpPatchPickToOut.js
浏览文件 @ 85cef2d3
......@@ -21,8 +21,6 @@ layui.config({
// 仓库出库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, {
savePreParams: function (params) {
// params.holderId=data.holderId
// params.holderKey=data.holderKey
},
saveData: function (params) {
// 保存数据
......
erp-produce/src/main/resources/template/js/erpPick/erpPickToOut.js
浏览文件 @ 85cef2d3
......@@ -17,38 +17,36 @@ layui.config({
// 领料出库单转仓库出库
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryRequisitionOutLetsTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
// 仓库出库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, {
savePreParams: function (params) {
// params.holderId=data.holderId
// params.holderKey=data.holderKey
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertRequisitionOutLetsToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
loadComponentCallback: function () {
$("select[attrkey='holderIdType']").prop('disabled', true);
$("select[attrkey='holderIdType']").parent().next().children('i').remove();
$("div[controlType='depotOutFromType']").remove();
},
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
$("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true);
}
});
}});
let data = json.bean;
// 仓库出库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024070100006', data, {
savePreParams: function (params) {
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertRequisitionOutLetsToTurnDepot", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
loadComponentCallback: function () {
$("select[attrkey='holderIdType']").prop('disabled', true);
$("select[attrkey='holderIdType']").parent().next().children('i').remove();
$("div[controlType='depotOutFromType']").remove();
},
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
$("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
$("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
$("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
$("div[controlType='simpleTable']").find(".normsId").prop('disabled', true);
$("div[controlType='simpleTable']").find(".warehouse").prop('disabled', true);
}
});
}});
});
\ No newline at end of file
erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js
浏览文件 @ 85cef2d3
......@@ -37,7 +37,7 @@ layui.config({
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name');
......
erp-produce/src/main/resources/template/js/erpPick/erpReturnPickList.js
浏览文件 @ 85cef2d3
......@@ -26,23 +26,23 @@ layui.config({
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' },
{ field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) {
var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
if (!isNull(d.fromId)) {
str += '<span class="state-new">[转]</span>';
}
return str;
}},
var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
if (!isNull(d.fromId)) {
str += '<span class="state-new">[转]</span>';
}
return str;
}},
{ field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 },
{ colspan: '2', title: '来源单据信息', align: 'center' },
{ field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) {
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
}},
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '入库状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("putState", 'id', d.otherState, 'name');
}},
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("putState", 'id', d.otherState, 'name');
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },
......@@ -50,11 +50,11 @@ layui.config({
{ title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
], [
{ field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("pickFromType", 'id', d.fromTypeId, 'name');
}},
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("pickFromType", 'id', d.fromTypeId, 'name');
}},
{ field: 'fromId', title: '单据编号', width: 200, templet: function (d) {
return getNotUndefinedVal(d.fromMation?.oddNumber);
}}
return getNotUndefinedVal(d.fromMation?.oddNumber);
}}
]],
done: function(json) {
matchingLanguage();
......@@ -88,7 +88,7 @@ layui.config({
function turnReturnMaterialToPut(data) {
_openNewWindows({
url: "../../tpl/erpPick/turnReturnMaterialToPut.html?id=" + data.id,
title: "转",
title: "转退料入库",
pageId: "turnReturnMaterialToPut",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
......
erp-produce/src/main/resources/template/js/erpPick/materialOutList.js
浏览文件 @ 85cef2d3
......@@ -39,7 +39,7 @@ layui.config({
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name');
......
erp-produce/src/main/resources/template/js/erpPick/returnMaterialPutList.js
浏览文件 @ 85cef2d3
......@@ -39,7 +39,7 @@ layui.config({
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '入库状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotPutState", 'id', d.otherState, 'name');
......
erp-produce/src/main/resources/template/js/erpPick/supplementOutList.js
浏览文件 @ 85cef2d3
......@@ -38,7 +38,7 @@ layui.config({
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("depotOutState", 'id', d.otherState, 'name');
......
erp-produce/src/main/resources/template/js/erpPick/turnPatchMaterialToTurnOut.js
浏览文件 @ 85cef2d3
......@@ -24,7 +24,6 @@ layui.config({
item.unitPrice=item.normsMation.estimatePurchasePrice
item.taxRate=0
});
console.log(data.erpOrderItemList)
// 补料出库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071200002', data, {
savePreParams: function (params) {
......@@ -32,9 +31,9 @@ layui.config({
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertPatchMaterialToTurnOut", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
loadComponentCallback: function () {
$("select[attrkey='departmentId']").prop('disabled', true);
......
erp-produce/src/main/resources/template/js/workshopMaterialInventory/workshopMaterialInventoryList.js 0 → 100644
浏览文件 @ 85cef2d3
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
var selTemplate = getFileContent('tpl/template/select-option.tpl');
// 加载当前用户所属车间
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryStaffBelongFarmList", params: {}, type: 'json', method: "GET", callback: function(json) {
$("#workshopId").html(getDataUseHandlebars(selTemplate, json));
form.render('select');
initTable();
}, async: false});
var workshopId = "";
form.on('select(workshopId)', function(data) {
var thisRowValue = data.value;
workshopId = isNull(thisRowValue) ? "" : thisRowValue;
loadTable();
});
function initTable() {
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'erpdepartstock001',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
{
field: 'materialMation', title: '产品', align: 'left', width: 120, templet: function (d) {
return isNull(d.materialMation) ? '' : d.materialMation.name
}
},
{
field: 'normsMation', title: '规格', align: 'left', width: 200, templet: function (d) {
return isNull(d.normsMation) ? '' : d.normsMation.name
}
},
{
field: 'departmentMation', title: '处理车间', align: 'left', width: 200, templet: function (d) {
return isNull(d.departmentMation) ? '' : d.departmentMation.name
}
},
{field: 'stock', title: '车间库存', align: 'center', width: 80}
]],
done: function (json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
var params = {
type: 'farm',
objectId: workshopId
}
return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('workshopMaterialInventoryList', {});
});
erp-produce/src/main/resources/template/js/workshopPersonnel/workshopPersonnelAllocation.js 0 → 100644
浏览文件 @ 85cef2d3
var rowId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
authBtn('1720880910884');
loadWorkshop();
form.render();
var chooseWorkshopId = "";
function loadWorkshop() {
table.render({
id: 'workshopTable',
elem: '#workshopTable',
method: 'get',
url: sysMainMation.erpBasePath + 'queryMyChargeFarmList',
even: false,
page: false,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
{ field: 'name', title: '车间', align: 'left', width: 150, templet: function (d) {
return '<a lay-event="select" class="notice-title-click">' + d.name + '</a>';
}}
]],
done: function(json) {
matchingLanguage();
chooseWorkshopId = "";
loadStaff("");
}
});
table.on('tool(workshopTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent == 'select') {
chooseWorkshopId = data.id;
loadStaff(data.id);
}
});
}
function loadStaff(workshopId) {
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'queryFarmStaffList',
where: {objectId: workshopId},
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
{ field: 'jobNumber', title: '工号', align: 'left', width: 140, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.jobNumber);
}},
{ field: 'userName', title: '姓名', width: 120, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.userName);
}},
{ field: 'companyName', title: '企业', width: 150, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.companyName);
}},
{ field: 'departmentName', title: '部门', width: 140, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.departmentName);
}},
{ field: 'jobName', title: '职位', width: 140, templet: function (d) {
return getNotUndefinedVal(d.staffMation?.jobName);
}},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar'}
]],
done: function(json) {
matchingLanguage();
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'delete') { // 删除
delet(data);
}
});
}
// 删除
function delet(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deleteFarmStaffById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
table.reloadData("messageTable", {page: {curr: 1}, where: {objectId: chooseWorkshopId}})
}});
});
}
// 添加
$("body").on("click", "#addBean", function() {
if (isNull(chooseWorkshopId)) {
winui.window.msg('请先选择车间信息.', {icon: 2, time: 2000});
return false;
}
systemCommonUtil.userStaffCheckType = true; // // 人员选择类型，1.多选；其他。单选
systemCommonUtil.checkStaffMation = []; // 选择时返回的对象
systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation) {
var list = new Array();
console.log(checkStaffMation)
$.each(checkStaffMation, function (i, item) {
list.push(item.id);
});
console.log(list)
var params = {
farmId: chooseWorkshopId,
staffId: JSON.stringify(list)
};
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertFarmStaff", params: params, type: 'json', method: "POST", callback: function (json) {
loadStaff(chooseWorkshopId);
}});
});
});
exports('workshopPersonnelAllocation', {});
});
erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js 0 → 100644
浏览文件 @ 85cef2d3
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
var selTemplate = getFileContent('tpl/template/select-option.tpl');
// 加载当前用户所属车间
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryStaffBelongFarmList", params: {}, type: 'json', method: "GET", callback: function(json) {
$("#workshopId").html(getDataUseHandlebars(selTemplate, json));
form.render('select');
initTable();
}, async: false});
var workshopId = "";
form.on('select(workshopId)', function(data) {
var thisRowValue = data.value;
workshopId = isNull(thisRowValue) ? "" : thisRowValue;
loadTable();
});
//车间任务
function initTable() {
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'queryMachinProcedureFarmList',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2'},
{
field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) {
var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
if (!isNull(d.fromId)) {
str += '<span class="state-new">[转]</span>';
}
return str;
}
},
{field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140},
{colspan: '2', title: '来源单据信息', align: 'center'},
{
field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) {
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}
},
{
field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
}
},
{
field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name');
}
},
{
field: 'createName',
title: systemLanguage["com.skyeye.createName"][languageType],
rowspan: '2',
width: 120
},
{
field: 'createTime',
title: systemLanguage["com.skyeye.createTime"][languageType],
rowspan: '2',
align: 'center',
width: 150
},
{
field: 'lastUpdateName',
title: systemLanguage["com.skyeye.lastUpdateName"][languageType],
rowspan: '2',
align: 'left',
width: 120
},
{
field: 'lastUpdateTime',
title: systemLanguage["com.skyeye.lastUpdateTime"][languageType],
rowspan: '2',
align: 'center',
width: 150
},
{
title: systemLanguage["com.skyeye.operation"][languageType],
rowspan: '2',
fixed: 'right',
align: 'center',
width: 200,
toolbar: '#tableBar'
}
], [
{
field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("pickFromType", 'id', d.fromTypeId, 'name');
}
},
{
field: 'fromId', title: '单据编号', width: 200, templet: function (d) {
return getNotUndefinedVal(d.fromMation?.oddNumber);
}
}
]],
done: function (json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
}
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'receive') { //接收
receive(data);
} else if (layEvent === 'antiReception') { //反接收
antiReception(data);
}
});
// 接收
function receive(data) {
layer.confirm('确认要接收该车间任务吗？', { icon: 3, title: '接收任务操作' }, function (index) {
activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) {
var params = {
id: data.id,
};
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "receiveMachinProcedureFarm", params: params, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg("接收成功", {icon: 1, time: 2000});
loadTable();
}});
});
});
}
function antiReception(data) {
layer.confirm('确认要反接收该车间任务吗？', { icon: 3, title: '反接收任务操作' }, function (index) {
activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) {
var params = {
id: data.id,
};
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "receptionReceiveMachinProcedureFarm", params: params, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg("反接收成功", {icon: 1, time: 2000});
loadTable();
}});
});
});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams(){
var params = {
type: 'farm',
objectId: workshopId
}
return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('workshopTasksList', {});
});
erp-produce/src/main/resources/template/tpl/erpPick/erpPatchPickToOut.html
浏览文件 @ 85cef2d3
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
<meta charset="UTF-8">
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet"/>
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet"/>
</head>
<body>
<div style="margin:0 auto;padding:20px;">
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div id="content"></div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>`
<button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
</div>
</div>
</form>
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div id="content"></div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" type="button" id="cancle">
<language showName="com.skyeye.cancel"></language>
</button>
<button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>
<button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/erpPick/'}).use('erpPatchPickToOut');
layui.config({base: '../../js/erpPick/'}).use('erpPatchPickToOut');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/erpPick/erpPickToOut.html
浏览文件 @ 85cef2d3
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
<meta charset="UTF-8">
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet"/>
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet"/>
</head>
<body>
<div style="margin:0 auto;padding:20px;">
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div id="content"></div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>`
<button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
</div>
</div>
</form>
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div id="content"></div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" type="button" id="cancle">
<language showName="com.skyeye.cancel"></language>
</button>
<button class="winui-btn" lay-submit lay-filter="formSaveDraft" id="formSaveDraft">保存为草稿</button>
<button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">提交</button>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/erpPick/'}).use('erpPickToOut');
layui.config({base: '../../js/erpPick/'}).use('erpPickToOut');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/processAcceptance/processAcceptanceList.html 0 → 100644
浏览文件 @ 85cef2d3
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/workshopMaterialInventory/workshopMaterialInventoryList.html 0 → 100644
浏览文件 @ 85cef2d3
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div class="winui-toolbar">
<div class="winui-tool">
<form class="layui-form layui-form-pane" action="" autocomplete="off" style="width: 50%; float: left;">
<select id="workshopId" name="workshopId" lay-filter="workshopId" lay-search="">
</select>
</form>
<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>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/workshopMaterialInventory/'}).use('workshopMaterialInventoryList');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/workshopPersonnel/workshopPersonnelAllocation.html 0 → 100644
浏览文件 @ 85cef2d3
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body style="background-color: rgb(242, 242, 242);">
<div class="layui-fluid">
<form class="layui-form" action="" id="showForm">
<div class="layui-col-xs12 margin-top-10 layui-col-space15">
<div class="layui-col-xs3">
<div class="layui-card">
<div class="layui-card-header">车间</div>
<div class="layui-card-body">
<table id="workshopTable" lay-filter="workshopTable"></table>
</div>
</div>
</div>
<div class="layui-col-xs9">
<div class="layui-card">
<div class="layui-card-header">员工</div>
<div class="layui-card-body">
<div class="winui-toolbar">
<div class="winui-tool">
<button id="addBean" class="winui-toolbtn" auth="1720880928131" type="button"><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">
{{# if(auth('1720881295139')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
</script>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/workshopPersonnel/'}).use('workshopPersonnelAllocation');
</script>
</body>
</html>
\ No newline at end of file
erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html 0 → 100644
浏览文件 @ 85cef2d3
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8"/>
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet"/>
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet"/>
</head>
<body>
<div class="winui-toolbar">
<div class="winui-tool">
<form class="layui-form layui-form-pane" action="" autocomplete="off" style="width: 50%; float: left;">
<select id="workshopId" name="workshopId" lay-filter="workshopId" lay-search="">
</select>
</form>
<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>
</div>
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
{{# if(d.editRow == 1) { }}
{{# if(auth('1720939511614')) { }}
<a class="layui-btn layui-btn-xs" lay-event="receive">接收</a>
{{# } }}
{{# if(auth('1720939488183')) { }}
<a class="layui-btn layui-btn-xs" lay-event="antiReception">反接收</a>
{{# } }}
{{# } }}
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/workshopTasks/'}).use('workshopTasksList');
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/js/materialCode/batchCopy.js
浏览文件 @ 85cef2d3
......@@ -64,7 +64,7 @@ layui.config({
}
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryNormsBarCodeList", params: params, type: 'json', method: 'POST', callback: function (json) {
$("#barCode").val(json.rows.join('\n'));
$("#tips").html("共计获取个" + json.total + "条形码");
$("#tips").html("共计获取" + json.total + "个条形码");
}});
}
return false;
......
erp/src/main/resources/template/js/purchaseDeliveryNote/purchaseDeliveryNoteList.js
浏览文件 @ 85cef2d3
......@@ -41,7 +41,7 @@ layui.config({
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'qualityInspection', title: '质检状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("orderQualityInspectionType", 'id', d.qualityInspection , 'name');
......
erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js
浏览文件 @ 85cef2d3
......@@ -37,7 +37,7 @@ layui.config({
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'returnState', title: '退货状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("qualityInspectionReturnState", 'id', d.returnState, 'name');
......
erp/src/main/resources/template/js/salesOutlet/salesOutletList.js
浏览文件 @ 85cef2d3
......@@ -41,7 +41,7 @@ layui.config({
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
......
erp/src/main/resources/template/js/salesReturns/salesReturnsList.js
浏览文件 @ 85cef2d3
......@@ -41,7 +41,7 @@ layui.config({
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
......
erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevelValue.js
浏览文件 @ 85cef2d3
......@@ -17,33 +17,33 @@ layui.config({
// 根据仓库id获取仓库级别信息
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelValById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
// 仓库级别的值的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071200008', data, {
let data = json.bean;
// 仓库级别的值的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071200008', data, {
savePreParams: function (params) {
params.parentId=data.parentId
params.depotId=data.depotId
},
savePreParams: function (params) {
params.parentId=data.parentId
params.depotId=data.depotId
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "writeDepotLevelVal", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
// loadComponentCallback: function () {
// // $("div[controlType='assetPurchasePutFromType']").remove();
// },
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
// $("div[controlType='simpleTable']").find(".assetId").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".fromId").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".chooseAssetBtn").prop('disabled', true);
}
});
}});
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "writeDepotLevelVal", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
// loadComponentCallback: function () {
// // $("div[controlType='assetPurchasePutFromType']").remove();
// },
tableAddRowCallback: function (tableId) {
$("#addRow" + tableId).remove();
// $("div[controlType='simpleTable']").find(".assetId").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".fromId").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
// $("div[controlType='simpleTable']").find(".chooseAssetBtn").prop('disabled', true);
}
});
}});
});
\ No newline at end of file
erp/src/main/resources/template/js/turnIocatorManage/turnIocatorManage.js
浏览文件 @ 85cef2d3
......@@ -10,7 +10,6 @@ layui.config({
fsTree = layui.fsTree,
form = layui.form,
table = layui.table;
// tableTree = layui.tableTreeDj;
var ztree;
var id = GetUrlParam("id");
var objectKey = GetUrlParam("objectKey")
......@@ -20,11 +19,11 @@ layui.config({
var dropdown = new Dropdown();
dropdown.render();
//获取所有仓库queryAllStoreHouseList queryDepotLevelValList
//获取所有仓库
/********* tree 处理 start *************/
fsTree.render({
id: "treeDemo",
url: sysMainMation.erpBasePath + "queryDepotLevelById?id=" + id,
url: sysMainMation.erpBasePath + "queryDepotLevelByDepotId?depotId=" + id,
checkEnable: false,
showLine: false,
showIcon: true,
......@@ -50,16 +49,6 @@ layui.config({
loadTable();
}
//
// function loadTable(id) {
// AjaxPostUtil.request({url: admBasePath + "queryDepotLevelById", params: {id: id}, type: 'json', method: "GET", callback: function (json) {
// initLoadTable();
// }});
// };
function initLoadTable() {
table.render({
id: 'messageTable',
......@@ -103,14 +92,28 @@ layui.config({
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200007', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
url: "../../tpl/turnIocatorManage/addWarehouseLevelValue.html?id=" + id,
title: "新增仓库级别的值",
pageId: "warehouseLevelValueAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
// _openNewWindows({
// url: "../../tpl/turnIocatorManage/writeWarehouseLevel.html?id=" + id,
// title: "新增仓库级别",
// pageId: "addWarehouseLevel",
// area: ['90vw', '90vh'],
// callBack: function (refreshCode) {
// winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
// // 刷新节点
// var nownode = ztree.getNodesByParam("id", "0", null);
// ztree.reAsyncChildNodes(nownode[0], "refresh");
// }});
});
// 编辑
......@@ -160,18 +163,15 @@ layui.config({
name: treeNode.name
};
$("#treeRight").html(getDataUseHandlebars($("#treeRightTemplate").html(), {bean: par}));
showRMenu('root', event.clientX, event.clientY);
// showRMenu(event.clientX, event.clientY);
showRMenu(folderId == 0 ? 'root' : '', event.clientX, event.clientY);
}
// 展示树节点右键菜单
function showRMenu(type, x, y) {
$("#treeRight .is-file").show();
if(type == 'root'){
$("#treeRight .add").hide();
$("#treeRight .edit").hide();
$("#treeRight .remove").hide();
if (type == 'root') {
$("#treeRight .treedeleteFolderAndChild").hide();
}
$("#treeRight").show();
$("#treeRight").css({top: y + "px", left: x + "px", visibility: "visible", position: "absolute"});
......@@ -222,15 +222,18 @@ layui.config({
// 树操作--新建
$("body").on("click", ".treecreateNewFolder", function (e) {
hideRMenu();
var parentId = $(this).attr("folderId");
// 打开一个新建布局
_openNewWindows({
url: "../../tpl/turnIocatorManage/addWarehouseLevel.html?id=" + id,
url: "../../tpl/turnIocatorManage/writeWarehouseLevel.html?depotId=" + id + "&parentId=" + parentId,
title: "新增仓库级别",
pageId: "addWarehouseLevel",
pageId: "writeWarehouseLevel",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
// 刷新节点
var nownode = ztree.getNodesByParam("id", "0", null);
ztree.reAsyncChildNodes(nownode[0], "refresh");
}});
});
......
erp/src/main/resources/template/js/turnIocatorManage/addWarehouseLevel.js → erp/src/main/resources/template/js/turnIocatorManage/writeWarehouseLevel.js
浏览文件 @ 85cef2d3
......@@ -14,16 +14,26 @@ layui.config({
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
var parentId = GetUrlParam("parentId");
var depotId = GetUrlParam("depotId");
// 根据仓库id获取仓库级别信息
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelByDepotId", params: {depotId: id}, type: 'json', method: 'GET', callback: function (json) {
if (isNull(id)) {
dsFormUtil.initAddPageForStatic('content', 'FP2024071100005', {
savePreParams: function (params) {
params.parentId = isNull(parentId) ? '0' : parentId;
params.depotId = depotId;
}
});
} else {
// 根据仓库id获取仓库级别信息
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelByDepotId", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
// 仓库级别的值的【编辑布局】
// 仓库级别的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071100006', data, {
savePreParams: function (params) {
params.parentId = data.parentId
params.depotId = id
params.parentId = isNull(parentId) ? '0' : parentId;
params.depotId = depotId;
},
saveData: function (params) {
......@@ -41,5 +51,6 @@ layui.config({
}
});
}});
}
});
\ No newline at end of file
erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html
浏览文件 @ 85cef2d3
......@@ -32,7 +32,7 @@
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
{{# if(d.state == 'pass') { }}
{{# if(d.state == 'pass' ) { }}
{{# if(auth('1571813426889')){ }}
<a class="layui-btn layui-btn-xs" lay-event="turnSales">转销售出库</a>
{{# } }}
......
erp/src/main/resources/template/tpl/turnIocatorManage/turnIocatorManage.html
浏览文件 @ 85cef2d3
......@@ -21,7 +21,7 @@
<div style="width: 240px; float: left; height: 100%; overflow: auto; padding: 5px;">
<input type="text" id="name" name="name" placeholder="请输入要搜索的节点" class="layui-input" />
<ul id="treeDemo" class="ztree fsTree" method="get" isRoot="1"
treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name"></ul>
treeIdKey="id" inputs="parentId" treePIdKey="parentId" clickCallbackInputs="parentId:$id" treeName="name"></ul>
</div>
<div style="width: calc(100% - 250px); float: left;">
<div style="margin:auto 10px;">
......@@ -40,14 +40,14 @@
<script type="text/x-handlebars-template" id="treeRightTemplate">
{{#bean}}
<li class="is-file treedeleteFolderAndChild">
<li class="is-file treedeleteFolderAndChild" folderId="{{id}}">
<a href="javascript:;">
<img alt="" src="../../assets/images/icon/delete-icon.png" />
<span>删除</span>
</a>
</li>
<li class="divider"></li>
<li class="is-file treecreateNewFolder">
<li class="is-file treecreateNewFolder" folderId="{{id}}">
<a href="javascript:;">
<img alt="" src="../../assets/images/icon/create-folder-icon.png" />
<span>新建</span>
......
erp/src/main/resources/template/tpl/turnIocatorManage/addWarehouseLevel.html → erp/src/main/resources/template/tpl/turnIocatorManage/writeWarehouseLevel.html
浏览文件 @ 85cef2d3
......@@ -23,7 +23,7 @@
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/turnIocatorManage/'}).use('addWarehouseLevel');
layui.config({base: '../../js/turnIocatorManage/'}).use('writeWarehouseLevel');
</script>
</body>
</html>
\ No newline at end of file
web/src/main/resources/bootstrap.yml
浏览文件 @ 85cef2d3
......@@ -12,6 +12,7 @@ spring:
discovery:
server-addr: 172.18.92.40:9000 # 配置服务注册nacos地址
namespace: ${spring.profiles.active} # 配置命名空间
service: ${spring.application.name} # 配置服务名
config:
# 指定nacos server的地址
server-addr: 172.18.92.40:9000
......
web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
浏览文件 @ 85cef2d3
......@@ -442,6 +442,7 @@ var dsFormUtil = {
content = dsFormUtil.getContentLinkedData(content);
}
content.title = dsFormUtil.getLable(content);
content.maxLength = dsFormUtil.getMaxLength(content);
if (isNull(content.attrDefinition)) {
content.attrDefinition = {};
}
......@@ -598,6 +599,16 @@ var dsFormUtil = {
return content.title;
},
getMaxLength: function (content) {
var attr = content.attrDefinition;
if (!isNull(attr) && !$.isEmptyObject(attr)) {
if (!isNull(attr.attrDefinitionCustom)) {
return attr.attrDefinitionCustom.maxLength;
}
}
return null;
},
// 获取属性关联的数据值来源信息
getContentLinkedData: function (content) {
if (isNull(content.attrDefinition) || isNull(content.attrDefinition.attrDefinitionCustom)) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或