提交 78b1f096 编写于 作者: L LAPTOP-NDCM9L6Q\王丽雅

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

......@@ -48,16 +48,22 @@ layui.config({
cols: [[
{ type: myUseAssetReportCheckType ? 'checkbox' : 'radio', rowspan: '3', fixed: 'left' },
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '3', fixed: 'left', type: 'numbers' },
{ field: 'name', title: '资产名称', width: 120 },
{ field: 'specifications', title: '资产规格', width: 140 },
// { field: 'name', title: '资产名称', width: 120 },
{ field: 'name', title: '资产名称', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.name);
}},
{ field: 'specifications', title: '资产规格', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.specifications);
}},
// { field: 'specifications', title: '资产规格', width: 140 },
{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
return '<img src="' + systemCommonUtil.getFilePath(d.assetMation?.assetImg) + '" class="photo-img" lay-event="assetImg">';
}},
{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId);
}},
{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
{ field: 'specifications', title: '资产规格', align: 'left', width: 120 },
// { field: 'specifications', title: '资产规格', align: 'left', width: 120 },
{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetAdminMation?.name);
}},
......
......@@ -48,13 +48,17 @@ layui.config({
cols: [[
{ type: assetReportCheckType ? 'checkbox' : 'radio', rowspan: '3', fixed: 'left' },
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '3', fixed: 'left', type: 'numbers' },
{ field: 'name', title: '资产名称', width: 120 },
{ field: 'specifications', title: '资产规格', width: 140 },
{ field: 'name', title: '资产名称', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.name);
}},
{ field: 'specifications', title: '资产规格', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.specifications);
}},
{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
return '<img src="' + systemCommonUtil.getFilePath(d.assetMation?.assetImg) + '" class="photo-img" lay-event="assetImg">';
}},
{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId);
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.assetMation?.typeId);
}},
{ field: 'assetNum', title: '资产编号', width: 160 },
{ field: 'storageArea', title: '存放区域', width: 200 },
......
......@@ -42,11 +42,12 @@ layui.config({
assetId: getNotUndefinedVal($("#assetId").attr(initTableChooseUtil.chooseInputDataIdKey)),
state: $("#state").val(),
limit: $("#number").val(),
number:$("#number").val(),
page: 1
}
AjaxPostUtil.request({url: sysMainMation.admBasePath + "queryAssetReportCodeList", 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;
......
......@@ -23,12 +23,14 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'name', title: '资产名称', align: 'left', width: 120 },
{ field: 'name', title: '资产名称', width: 120, templet: function(d) {
return getNotUndefinedVal(d.assetMation?.name);
}},
{ field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
return '<img src="' + systemCommonUtil.getFilePath(d.assetMation.assetImg) + '" class="photo-img" lay-event="assetImg">';
}},
{ field: 'typeId', title: '资产类型', width: 120, templet: function(d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId);
return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.assetMation.typeId);
}},
{ field: 'assetNum', title: '资产编号', align: 'left', width: 150 },
{ field: 'assetAdminMation', title: '管理员', width: 120, templet: function(d) {
......
......@@ -19,13 +19,12 @@
</div>
<div style="margin: auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
<script type="text/html" id="messageTableBar">
{{# if (isNull(d.state)) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript">
......
......@@ -12,6 +12,7 @@ layui.config({
authBtn('1593876735471');//新增
//补料单
table.render({
id: 'messageTable',
elem: '#messageTable',
......@@ -23,24 +24,37 @@ layui.config({
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单据编号', align: 'center', width: 180, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}},
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'totalPrice', title: '物料合计', align: 'left', width: 100 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 150 },
{ 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' }
{ 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();
......@@ -63,17 +77,32 @@ layui.config({
subApproval(data);
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
}else if (layEvent === 'turnPatchMaterialToTurnOut') { //转补料出库
turnPatchMaterialToTurnOut(data);
} else if (layEvent === 'revoke') { //撤销
revoke(data);
}
});
// 转领料出库
function turnPatchMaterialToTurnOut(data) {
_openNewWindows({
url: "../../tpl/erpPick/turnPatchMaterialToTurnOut.html?id=" + data.id,
title: "转领料出库",
pageId: "turnPatchMaterialToTurnOut",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2023100600001', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "erpPatchAdd",
pageId: "erpPatchPickAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
......@@ -86,7 +115,7 @@ layui.config({
_openNewWindows({
url: systemCommonUtil.getUrl('FP2023100600002&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "erpPatchEdit",
pageId: "erpPatchPickEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
......@@ -99,7 +128,7 @@ layui.config({
_openNewWindows({
url: systemCommonUtil.getUrl('FP2023100600003&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "erpPatchDetails",
pageId: "erpPatchPickDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
......
......@@ -11,7 +11,7 @@ layui.config({
table = layui.table;
authBtn('1593864516103');//新增
//领料单
table.render({
id: 'messageTable',
elem: '#messageTable',
......@@ -23,24 +23,37 @@ layui.config({
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单据编号', align: 'center', width: 180, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'machinMation', rowspan: '2', title: '加工单', align: 'center', width: 200, templet: function (d) {return isNull(d.machinMation) ? '' : d.machinMation.oddNumber}},
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'totalPrice', title: '物料合计', align: 'left', width: 100 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 150 },
{ 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' }
{ 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();
......@@ -63,11 +76,26 @@ layui.config({
subApproval(data);
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
} else if (layEvent === 'turnRequisitionMaterialToOut') { //转领料出库
turnRequisitionMaterialToOut(data);
}else if (layEvent === 'revoke') { //撤销
revoke(data);
}
});
// 转领料出库
function turnRequisitionMaterialToOut(data) {
_openNewWindows({
url: "../../tpl/erpPick/turnRequisitionMaterialToOut.html?id=" + data.id,
title: "转领料出库",
pageId: "turnRequisitionMaterialToOut",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
......@@ -108,7 +136,7 @@ layui.config({
// 删除
function del(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erppick008", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deleteRequisitionMaterialById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
......
......@@ -11,7 +11,8 @@ layui.config({
table = layui.table;
authBtn('1593877820765');//新增
//退料单
table.render({
id: 'messageTable',
elem: '#messageTable',
......
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 serviceClassName = sysServiceMation["materialOutList"]["key"];
authBtn('1720705501263');//新增
//领料出库单
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'queryRequisitionOutLetList',
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: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 },
{ 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("depotOutState", '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("requisitionOutLetFromType", '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 === 'delete') { //删除
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'subApproval') { //提交审核
erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
});
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200004', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "materialOutListAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 编辑
function edit(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200005&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "materialOutListEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 详情
function details(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024070100001&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "materialOutListDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('materialOutList', {});
});
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 serviceClassName = sysServiceMation["returnMaterialPutList"]["key"];
authBtn('1720705921518');//新增
//退料入库单
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'queryReturnPutList',
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: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 },
{ 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("depotPutState", '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("returnPutFromType", '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 === 'delete') { //删除
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'subApproval') { //提交审核
erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
});
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200011', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "returnMaterialPutListAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 编辑
function edit(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200012&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "returnMaterialPutListEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 详情
function details(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024070100003&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "returnMaterialPutListDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('returnMaterialPutList', {});
});
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 serviceClassName = sysServiceMation["supplementOutList"]["key"];
authBtn('1720705670125');//新增
//补料出库单
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'queryPatchOutLetList',
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: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 },
{ 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("depotOutState", '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("patchOutLetFromType", '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 === 'delete') { //删除
erpOrderUtil.deleteOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'subApproval') { //提交审核
erpOrderUtil.submitOrderMation(data.id, serviceClassName, function() {
loadTable();
});
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
erpOrderUtil.revokeOrderMation(data.processInstanceId, serviceClassName, function() {
loadTable();
});
}
});
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200001', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "supplementOutListAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 编辑
function edit(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200002&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "supplementOutListEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 详情
function details(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024070100002&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "supplementOutListDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('materialOutList', {});
});
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
// 补料单转补料出库单
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryPatchMaterialTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
data.erpOrderItemList=data.pickChildList
$.each(data.erpOrderItemList, function(index, item){
item.operNumber=item.needNum
item.unitPrice=item.normsMation.estimatePurchasePrice
item.taxRate=0
});
console.log(data.erpOrderItemList)
// 补料出库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071200002', data, {
savePreParams: function (params) {
},
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';
}});
},
loadComponentCallback: function () {
$("select[attrkey='departmentId']").prop('disabled', true);
$("select[attrkey='farmId']").prop('disabled', true);
$("div[controlType='patchOutLetFromType']").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
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
// 领料单转领料出库单
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryRequisitionMaterialTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
data.erpOrderItemList=data.pickChildList
$.each(data.erpOrderItemList, function(index, item){
item.operNumber=item.needNum
item.unitPrice=item.normsMation.estimatePurchasePrice
item.taxRate=0
});
console.log(data.erpOrderItemList)
// 领料出库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071200005', data, {
savePreParams: function (params) {
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "insertRequisitionMaterialToTurnOut", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
},
loadComponentCallback: function () {
$("select[attrkey='departmentId']").prop('disabled', true);
$("select[attrkey='farmId']").prop('disabled', true);
$("div[controlType='requisitionOutLetFromType']").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
......@@ -34,6 +34,13 @@
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
{{# if (d.state == 'pass') { }}
{{# if (d.otherState == 1 ||d.otherState == 2) { }}
{{# if (auth('1720843520948')) { }}
<a class="layui-btn layui-btn-xs" lay-event="turnPatchMaterialToTurnOut">转补料出库</a>
{{# } }}
{{# } }}
{{# } }}
</script>
</div>
......
......@@ -34,6 +34,13 @@
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
{{# if (d.state == 'pass') { }}
{{# if (d.otherState == 1 ||d.otherState == 2) { }}
{{# if (auth('1720789496468')) { }}
<a class="layui-btn layui-btn-xs" lay-event="turnRequisitionMaterialToOut">转领料出库</a>
{{# } }}
{{# } }}
{{# } }}
</script>
</div>
......
<!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">
<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">
{{# if (d.editRow == 1) { }}
{{# if (auth('1720705533317')) { }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if (auth('1720705501263')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if (auth('1720705482582')) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# } }}
{{# if (d.editRow == 2) { }}
{{# if (auth('1720705464941')) { }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</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/erpPick/'}).use('materialOutList');
</script>
</body>
</html>
\ No newline at end of file
<!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">
<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">
{{# if (d.editRow == 1) { }}
{{# if (auth('1720705863962')) { }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if (auth('1720705921518')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if (auth('1720705960266')) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# } }}
{{# if (d.editRow == 2) { }}
{{# if (auth('1720705935264')) { }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</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/erpPick/'}).use('returnMaterialPutList');
</script>
</body>
</html>
\ No newline at end of file
<!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">
<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">
{{# if (d.editRow == 1) { }}
{{# if (auth('1720705646742')) { }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if (auth('1720705670125')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if (auth('1720705746305')) { }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# } }}
{{# if (d.editRow == 2) { }}
{{# if (auth('1720705767409')) { }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</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/erpPick/'}).use('supplementOutList');
</script>
</body>
</html>
\ No newline at end of file
<!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 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>
</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('turnPatchMaterialToTurnOut');
</script>
</body>
</html>
\ No newline at end of file
<!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 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>
</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('turnRequisitionMaterialToOut');
</script>
</body>
</html>
\ No newline at end of file
......@@ -19,7 +19,6 @@ layui.config({
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryQualityInspectionTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
data.erpOrderItemList=data.qualityInspectionItemList
console.log(data)
// 采购入库的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2023042300002', data, {
savePreParams: function (params) {
......
......@@ -250,7 +250,6 @@ layui.config({
// 获取所选供应商的联系人
AjaxPostUtil.request({url: sysMainMation.reqBasePath + "queryContactsListByObject", params: {objectId:supplierMation.id}, type: 'json', method: "GET", callback: function(json) {
let contactsList = json.rows;
console.log(contactsId);
$("#" + contactsId).html(getDataUseHandlebars(selOption, {rows: contactsList}));
form.render();
}});
......
......@@ -15,20 +15,20 @@ layui.config({
var $ = layui.$;
var id = GetUrlParam("id");
// 资产采购订单转资产采购入库
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelValById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
// 根据仓库id获取仓库级别信息
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelByDepotId", params: {depotId: id}, type: 'json', method: 'GET', callback: function (json) {
let data = json.bean;
// 仓库级别的值的【编辑布局】
dsFormUtil.initEditPageForStatic('content', 'FP2024071200008', data, {
dsFormUtil.initEditPageForStatic('content', 'FP2024071100006', data, {
savePreParams: function (params) {
params.parentId=data.parentId
params.depotId=data.depotId
params.parentId = data.parentId
params.depotId = id
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "writeDepotLevelVal", params: params, type: 'json', method: "POST", callback: function(json) {
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "writeDepotLevel", params: params, type: 'json', method: "POST", callback: function(json) {
parent.layer.close(index);
parent.refreshCode = '0';
}});
......@@ -38,10 +38,6 @@ layui.config({
// },
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);
}
});
}});
......
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
// 根据仓库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, {
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: "GET", 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
......@@ -10,7 +10,11 @@ layui.config({
fsTree = layui.fsTree,
form = layui.form,
table = layui.table;
// tableTree = layui.tableTreeDj;
var ztree;
var id = GetUrlParam("id");
var objectKey = GetUrlParam("objectKey")
var objectId = GetUrlParam("objectId")
// 下拉按钮
var dropdown = new Dropdown();
......@@ -20,7 +24,7 @@ layui.config({
/********* tree 处理 start *************/
fsTree.render({
id: "treeDemo",
url: sysMainMation.erpBasePath + "queryDepotLevelById",
url: sysMainMation.erpBasePath + "queryDepotLevelById?id=" + id,
checkEnable: false,
showLine: false,
showIcon: true,
......@@ -46,6 +50,16 @@ 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',
......@@ -59,17 +73,7 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
// { field: 'name', title: '名称', rowspan: '2', align: 'left', width: 300, templet: function (d) {
// return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
// }},
{ field: 'number', title: '编号', rowspan: '2', align: 'left', width: 350 },
// { field: 'warehousing', title: '仓储费', rowspan: '2', align: 'left', width: 150 },
// { field: 'truckage', title: '搬运费', rowspan: '2', align: 'left', width: 150 },
// // { field: 'isDefault', title: '是否默认', rowspan: '2', align: 'left', width: 100 },
// { field: 'isDefault', title: '是否默认', width: 100, align: "center", templet: function (d) {
// // return shopUtil.getMealOrderWhetherGiveName(d);
// return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonIsDefault", 'id', d.isDefault, 'name');
// }},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', align: 'left', 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 },
......@@ -138,7 +142,7 @@ layui.config({
function del(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.admBasePath + "deleteDepotLevelValById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deleteDepotLevelValById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
......@@ -157,8 +161,10 @@ layui.config({
};
$("#treeRight").html(getDataUseHandlebars($("#treeRightTemplate").html(), {bean: par}));
showRMenu('root', event.clientX, event.clientY);
// showRMenu(event.clientX, event.clientY);
}
// 展示树节点右键菜单
function showRMenu(type, x, y) {
$("#treeRight .is-file").show();
......@@ -218,7 +224,7 @@ layui.config({
hideRMenu();
// 打开一个新建布局
_openNewWindows({
url: "../../tpl/turnIocatorManage/addWarehouseLevel.html?id=" + data.id,
url: "../../tpl/turnIocatorManage/addWarehouseLevel.html?id=" + id,
title: "新增仓库级别",
pageId: "addWarehouseLevel",
area: ['90vw', '90vh'],
......@@ -228,17 +234,18 @@ layui.config({
}});
});
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
tableTree.reload("messageTable", {where: getTableParams()});
table.reload("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
return $.extend(true, {objectKey:objectKey,objectId:objectId}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('turnIocatorManage', {});
......
<!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 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>
</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/turnIocatorManage/'}).use('addWarehouseLevel');
</script>
</body>
</html>
\ No newline at end of file
......@@ -13,7 +13,7 @@
<div class="winui-toolbar">
<div class="winui-tool">
<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="1656776769966"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
<button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1720752315835"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn">新增仓库级别的值</language></button>
</div>
</div>
......@@ -56,12 +56,17 @@
{{/bean}}
</script>
<ul class="layui-dropdown-menu" id="treeRight">
</ul>
<script src="../../assets/lib/layui/layui.js"></script>
<script src="../../assets/lib/layui/custom.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/jquery-min.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/contextMenu/jquery.contextMenu.min.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.all.min.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.exhide.min.js"></script>
<script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/fuzzysearch.js"></script>
<script src="../../js/commonFile/fileConsoleListCommon.js"></script>
<script type="text/javascript">
layui.config({base: '../../js/turnIocatorManage/'}).use('turnIocatorManage');
......
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'tagEditor', 'laydate'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
AjaxPostUtil.request({
url: sysMainMation.schoolBasePath + "queryAssignmentSubById",
params: {id: id},
type: 'json',
method: 'GET',
callback: function (json) {
let data = json.bean;
dsFormUtil.initEditPageForStatic('content', 'FP2024071300013', data, {
savePreParams: function (params) {
}
});
}
});
});
\ No newline at end of file
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 assignmentId = GetUrlParam("id");
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'get',
url: sysMainMation.schoolBasePath + 'queryAssignmentSubListByAssignmentId',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'name', title: '姓名', align: 'left', width: 150, templet: function(d) {
return getNotUndefinedVal(d.createMation?.name);
}},
{ field: 'accountNumber', title: '学号', align: 'left', width: 180, templet: function(d) {
return getNotUndefinedVal(d.createMation?.accountNumber);
}},
{ field: 'content', title: '内容', align: 'left', width: 180, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.content + '</a>';
}},
{ field: 'state', title: '状态', align: 'left',width: 150, templet: function(d) {
var str = '';
if (d.state == 'beCorrected') {
str +='未批改';
}else{
str +='已批改';
}
return str;
}},
{ field: 'score', title: '分数', align: 'left',width: 150},
{ field: 'lastUpdateTime', title: '最后提交时间', align: 'center', width: 250 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#tableBar' }
]],
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 === 'correct') { //批改
correct(data);
} else if (layEvent === 'details') { //详情
details(data);
}
});
// 详情
function details(data) {
parent.parent._openNewWindows({
url: systemCommonUtil.getUrl('FP2024071300001&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "homeworkDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
//批改
function correct(data) {
console.log(11)
parent.parent._openNewWindows({
url: '../../tpl/homework/correct.html?id=' + data.id,
title: '作业批改',
pageId: "homeworkCorrect",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
let params = {
assignmentId: assignmentId
}
return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('hasSubmit', {});
});
......@@ -60,12 +60,14 @@ layui.config({
details(data);
} else if (layEvent === 'del') { //删除
del(data);
}else if (layEvent === 'submit') { //提交情况
submit(data);
}
});
// 新增
$("body").on("click", "#addBean", function() {
parent._openNewWindows({
parent.parent._openNewWindows({
url: '../../tpl/homework/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId,
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "homeworkAdd",
......@@ -78,7 +80,7 @@ layui.config({
// 编辑
function edit(data) {
parent._openNewWindows({
parent.parent._openNewWindows({
url: '../../tpl/homework/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId+ '&id=' + data.id,
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "homeworkEdit",
......@@ -91,7 +93,7 @@ layui.config({
// 详情
function details(data) {
parent._openNewWindows({
parent.parent._openNewWindows({
url: systemCommonUtil.getUrl('FP2024070900002&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "homeworkDetails",
......@@ -111,6 +113,19 @@ layui.config({
});
}
//提交情况
function submit(data) {
parent.parent._openNewWindows({
url: '../../tpl/homework/submit.html?id=' + data.id,
title: '提交情况',
pageId: "homeworkSubmit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
......@@ -123,5 +138,5 @@ layui.config({
return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId,subjectClassesId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('coursewareList', {});
exports('homeworkList', {});
});
\ No newline at end of file
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 assignmentId = GetUrlParam("id");
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'get',
url: sysMainMation.schoolBasePath + 'queryAssignmentNotSubListByAssignmentId',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'name', title: '姓名', align: 'center', width: 200},
{ field: 'accountNumber', title: '学号', align: 'left', width: 200 },
{ field: 'signature', title: '个性签名', align: 'left',width: 250},
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 250 }
]],
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() {
let params = {
assignmentId: assignmentId
}
return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('noSubmit', {});
});
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form;
var objectId = GetUrlParam("objectId");
var objectKey = GetUrlParam("objectKey");
var id = GetUrlParam("id");
tabPageUtil.init({
id: 'tab',
prefixData: [{
title: '已提交',
pageUrl: '../../tpl/homework/hasSubmit.html?id=' + id,
}],
suffixData: [{
title: '未提交',
pageUrl: '../../tpl/homework/noSubmit.html?id=' + id,
}],
element: layui.element,
object: {
objectId: objectId,
objectKey: objectKey,
}
});
form.render();
});
\ No newline at end of file
<!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 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="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/homework/'}).use('correct');
</script>
</body>
</html>
<!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">
<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">
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="correct">批改</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/homework/'}).use('hasSubmit');
</script>
</body>
</html>
\ No newline at end of file
......@@ -18,6 +18,7 @@
<script type="text/html" id="tableBar">
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><language showName="com.skyeye.deleteBtn"></language></a>
<a class="layui-btn layui-btn-xs layui-btn-primary" lay-event="submit">提交情况</a>
</script>
</div>
<script src="../../assets/lib/layui/layui.js"></script>
......
<!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">
<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>
</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/homework/'}).use('noSubmit');
</script>
</body>
</html>
\ No newline at end of file
<!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="body-box">
<div class="layui-col-xs12" style="height: 100%" id="tab">
</div>
</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/homework/'}).use('submit');
</script>
</body>
</html>
\ No newline at end of file
......@@ -156,10 +156,13 @@ var AjaxPostUtil = {
setRequestHeaders(xmlhttp);
if("GET" === method.toUpperCase()) {
xmlhttp.send(null);
} else if("POST" === method.toUpperCase() || "PUT" === method.toUpperCase() || "DELETE" === method.toUpperCase()) {
} else if("POST" === method.toUpperCase() || "PUT" === method.toUpperCase()) {
// 如果是POST提交,设置请求头信息
xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
xmlhttp.send(formateParams);
} else if("DELETE" === method.toUpperCase()) {
xmlhttp.setRequestHeader("Content-Type", "application/json");
xmlhttp.send(JSON.stringify(ajaxObj.options.params));
}
}
};
\ No newline at end of file
......@@ -51,6 +51,7 @@
"supplierContractAuthEnum": {"name": "供应商合同权限", "className": "skyeye-erp#com.skyeye.contract.classenum.SupplierContractAuthEnum", "pageUrl": "../../tpl/supplierContract/supplierContractList.html"},
"machinStateEnum": {"name": "加工单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinStateEnum"},
"machinPickStateEnum": {"name": "加工单领料状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinPickStateEnum"},
"outLetState": {"name": "领料/补料单出库状态", "className": "skyeye-erp#com.skyeye.pick.classenum.OutLetState"},
"machinChildStateEnum": {"name": "工序验收单状态", "className": "skyeye-erp#com.skyeye.machin.classenum.MachinChildStateEnum"},
"materialNormsCodeInDepot": {"name": "商品规格一物一码库存状态", "className": "skyeye-erp#com.skyeye.material.classenum.MaterialNormsCodeInDepot"},
"orderItemQualityInspectionType": {"name": "ERP采购子单据质检类型", "className": "skyeye-erp#com.skyeye.business.classenum.OrderItemQualityInspectionType"},
......@@ -58,8 +59,6 @@
"orderArrivalState": {"name": "采购订单到货状态", "className": "skyeye-erp#com.skyeye.purchase.classenum.OrderArrivalState"},
"holderNormsChildState": {"name": "关联的客户/供应商/会员购买或者出售的商品子信息状态", "className": "skyeye-erp#com.skyeye.holder.classenum.HolderNormsChildState"},
"depotOutState": {"name": "仓库出库单状态", "className": "skyeye-erp#com.skyeye.depot.classenum.DepotOutState"},
"purchaseOrderFromType": {"name": "采购订单来源单据类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.PurchaseOrderFromType"},
"purchaseDeliveryFromType": {"name": "到货单来源单据类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.PurchaseDeliveryFromType"},
"purchasePutFromType": {"name": "采购入库单来源单据类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.PurchasePutFromType"},
......
......@@ -23,8 +23,11 @@
"machinChild": {"name": "工序验收单", "key": "com.skyeye.machin.service.impl.ErpProcessAcceptanceSheetServiceImpl"},
"productionHead": {"name": "生产计划单", "key": "com.skyeye.production.service.impl.ErpProductionServiceImpl"},
"pickPicking": {"name": "领料单", "key": "com.skyeye.pick.service.impl.RequisitionMaterialServiceImpl"},
"materialOutList": {"name": "领料出库单", "key": "com.skyeye.pick.service.impl.RequisitionOutLetServiceImpl"},
"pickReplenishment": {"name": "补料单", "key": "com.skyeye.pick.service.impl.PatchMaterialServiceImpl"},
"supplementOutList": {"name": "补料出库单", "key": "com.skyeye.pick.service.impl.PatchOutLetServiceImpl"},
"pickReturn": {"name": "退料单", "key": "com.skyeye.pick.service.impl.ReturnMaterialServiceImpl"},
"returnMaterialPutList": {"name": "退料入库单", "key": "com.skyeye.pick.service.impl.ReturnPutServiceImpl"},
"proworkLoad": {"name": "项目工作量审核", "key": "com.skyeye.service.impl.ProWorkloadServiceImpl"},
"proTask": {"name": "项目任务审核", "key": "com.skyeye.service.impl.ProTaskServiceImpl"},
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册