提交 c3487940 编写于 作者: L LAPTOP-UV1MNL38\18023

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);
}},
......
......@@ -16,8 +16,8 @@ layui.config({
var assetReportCheckType = isNull(parent.adminAssistantUtil.assetReportCheckType) ? false : parent.adminAssistantUtil.assetReportCheckType;
// 设置提示信息
var s = '资产明细选择规则:';
if(assetReportCheckType){
var s = '资产明细选择规则:仅加载未领用的资产信息。<br>';
if (assetReportCheckType) {
s += '1.多选;如没有查到要选择的资产信息,请检查资产信息是否满足当前规则。';
var ids = [];
$.each(parent.adminAssistantUtil.checkAssetReportMation, function(i, item) {
......@@ -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">
......
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('1720705272841');
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
// 获取预生产计划单列表
url: sysMainMation.erpBasePath + 'queryProductionPlanList',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'oddNumber', title: '生产单号', align: 'center', rowspan: '2', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'operTime', title: '单据日期', align: 'center', rowspan: '2', 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("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], align: 'center', rowspan: '2',width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', rowspan: '2',width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', rowspan: '2',width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', rowspan: '2',width: 240, toolbar: '#tableBar'}
],[
{ field: 'fromTypeId', title: '来源类型', rowspan: '2',width: 150, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sealOutLetFromType", 'id', d.fromTypeId, 'name');
}},
{ field: 'fromId', title: '单据编号', rowspan: '2',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') { //删除
del(data, obj);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'subApproval') { //提交审核
subApproval(data);
} else if (layEvent === 'processDetails') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
revoke(data);
}
});
// 新增
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071100001', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "erpProductionAdd",
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('FP2024071100002&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "erpProductionEdit",
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('FP2024071100003&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "erpProductionDetail",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 删除
function del(data, obj) {
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 + "deleteProductionPlan", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
// 提交审批
function subApproval(data) {
layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
layer.close(index);
activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) {
var params = {
id: data.id,
approvalId: approvalId
};
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "submitProductionPlanToApproval", params: params, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable();
}});
});
});
}
// 撤销
function revoke(data) {
layer.confirm('确认撤销该申请吗?', { icon: 3, title: '撤销操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokeProductionPlan", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", 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() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('erpPreProductionPlanList', {});
});
<!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="1590913527206"><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('1720705286166')) { }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(auth('1590913527206')) { }}
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1590926876459')) { }}
<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('1696246760629')) { }}
<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/erpPreProductionPlan/'}).use('erpPreProductionPlanList');
</script>
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>
\ No newline at end of file
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>
\ 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");
// 根据仓库id获取仓库级别信息
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryDepotLevelByDepotId", params: {depotId: 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
},
saveData: function (params) {
// 保存数据
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "writeDepotLevel", 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();
}
});
}});
});
\ 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");
// 根据仓库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
var folderId = "2";//当前所在目录的位置
var operaterId = "";//即将进行删除,重命名等操作的id
var folderTemplate;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'dropdown', 'fsCommon', 'fsTree', 'viewer', 'contextMenu', 'ClipboardJS', 'colorpicker', 'jqueryUI', 'webuploader','tableTreeDj'], function (exports) {
}).define(['window', 'jquery', 'winui', 'dropdown', 'fsCommon', 'fsTree', 'table', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
fsTree = layui.fsTree,
fsCommon = layui.fsCommon,
colorpicker = layui.colorpicker,
device = layui.device(),
tableTree = layui.tableTreeDj;
var currentUserId = "";
// 获取当前登录员工信息
systemCommonUtil.getSysCurrentLoginUserMation(function (data) {
currentUserId = data.bean.id;
});
//遮罩层显示
$(".fileconsole-mask").show();
matchingLanguage();
//下拉按钮
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();
dropdown.render();
var ztree = null;
//获取所有仓库queryAllStoreHouseList queryDepotLevelValList
/********* tree 处理 start *************/
fsTree.render({
id: "treeDemo",
url: sysMainMation.diskCloudBasePath + "fileconsole001",
url: sysMainMation.erpBasePath + "queryDepotLevelById?id=" + id,
checkEnable: false,
loadEnable: true,//异步加载
showLine: false,
showIcon: true,
addDiyDom: addDiyDom,
clickCallback: zTreeOnClick,
addDiyDom: ztreeUtil.addDiyDom,
clickCallback: onClickTree,
onRightClick: onRightClick,
onDblClick: function(){},
onAsyncSuccess: function(id){}
}, function(id){
onDblClick: function() {},
onAsyncSuccess: function(id) {}
}, function(id) {
ztree = $.fn.zTree.getZTreeObj(id);
loadThisFolderChild();
fuzzySearch(id, '#name', null, true);
initLoadTable();
ztreeUtil.initEventListener(id);
});
function addDiyDom(treeId, treeNode) {
// css样式以及位置调整
var spaceWidth = 8;
var switchObj = $("#" + treeNode.tId + "_switch"),
icoObj = $("#" + treeNode.tId + "_ico");
switchObj.remove();
icoObj.before(switchObj);
if (treeNode.level >= 1) {
var spaceStr = "<span style='display: inline-block;width:" + (spaceWidth * treeNode.level) + "px'></span>";
switchObj.before(spaceStr);
//异步加载的方法
function onClickTree(event, treeId, treeNode) {
if(treeNode == undefined) {
dictTypeId = "";
} else {
dictTypeId = treeNode.id;
}
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',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'queryDepotLevelValList',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'number', title: '编号', rowspan: '2', align: 'left', width: 350 },
{ 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 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 },
]],
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 === 'edit') { //编辑
edit(data);
} else if (layEvent === 'details'){ //详情
details(data);
} else if (layEvent === 'del') { //删除
del(data);
}
});
}
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200007', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "warehouseLevelValueAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 操作数据
var aObj = $("#" + treeNode.tId + "_a");
if ($("#diyBtn_" + treeNode.id).length > 0) return;
aObj.after("");
aObj.addClass("tree_a");
aObj.attr("ztreerowid", treeNode.id);
// 编辑
function edit(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024071200008&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "warehouseLevelValueEdit",
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('FP2024071200009&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "warehouseLevelValueDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 删除
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.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();
}});
});
}
// 树节点右键
function onRightClick(event, treeId, treeNode) {
folderId = treeNode.id;
......@@ -80,11 +160,11 @@ layui.config({
name: treeNode.name
};
$("#treeRight").html(getDataUseHandlebars($("#treeRightTemplate").html(), {bean: par}));
{
showRMenu('root', event.clientX, event.clientY);
}
showRMenu('root', event.clientX, event.clientY);
// showRMenu(event.clientX, event.clientY);
}
// 展示树节点右键菜单
function showRMenu(type, x, y) {
$("#treeRight .is-file").show();
......@@ -110,238 +190,62 @@ layui.config({
}
}
// 刷新树指定节点
function refreshTreePointNode(){
// 刷新节点
var nownode = ztree.getNodesByParam("id", folderId, null);
ztree.reAsyncChildNodes(nownode[0], "refresh");
}
// 树的动画效果
$("body").on("mouseover", "#treeDemo a", function (e) {
$("#treeDemo").find("a").removeClass('mouseOver');
$(this).addClass('mouseOver');
});
$("body").on("mouseleave", "#treeDemo", function (e) {
$("#treeDemo").find("a").removeClass('mouseOver');
});
// 设置选中节点
function chooseNodeSelect(nodeId){
var selNode = ztree.getNodeByParam("id", nodeId, null);
ztree.selectNode(selNode);
}
// 右侧内容右键操作
$("body").on("contextmenu", "#file-content .file", function (e) {
var _this = $(this);
operaterId = _this.attr("rowid");
// 1.加载右侧右键内容
initFileContentRight(_this, e);
// 2.加载选中
setChooseFileContent(_this);
});
// 加载右侧右键内容
function initFileContentRight(_this, e) {
var par = {
id: _this.attr("rowid"),
name: _this.find(".title").html(),
fileType: _this.attr("filetype")
};
$("#fileRightMenu").show();
$("#fileRightMenu").html(getDataUseHandlebars($("#fileRightMenuTemplate").html(), {bean: par}));
$("#fileRightMenu").css({top: e.clientY + "px", left: e.clientX + "px", visibility: "visible", position: "absolute"});
if ($.inArray(_this.attr("filetype"), officeType) == -1) {
$(".openByOnlyOffice").hide();
$(".openByMicrosoftOffice").hide();
}
}
// 加载选中
function setChooseFileContent(_this){
$(".select-op-more").find("button[class*='btn-custom']").show();
$(".select-op-more").find("li[class*='is-file']").show();
$(".select-op-more").show();
$("#file-content").find("div").removeClass("active");
// 获取创建人
var createId = _this.attr("createId");
// 权限控制
authControllerFile(createId);
// 其他选中取消
$("#file-content .menu-folder .item-select .item-check").find("input:checkbox[name='checkFile']:checked").prop("checked", false);
// 添加选中样式
_this.addClass("active");
// 设置当前选中
_this.children(".item-select").children(".item-check").find("input:checkbox[name='checkFile']").prop("checked", true);
}
// 树节点点击事件
function zTreeOnClick(event, treeId, treeNode) {
var folderName = getFilePath(treeNode);
$(".yarnball").html('<li class="yarnlet first"><a title="/">/</a></li>' + folderName);
if(treeNode.id != folderId){
folderId = treeNode.id;
loadThisFolderChild();
}
// 如果节点不展开,则展开
if(!treeNode.open){
ztree.expandNode(treeNode);
}
};
function getFileMation(id, callback) {
AjaxPostUtil.request({url: sysMainMation.diskCloudBasePath + "queryFileConsoleById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
if (typeof callback == "function") {
callback(json.bean)
}
}});
}
// 文件夹或者文件重命名
$("body").on("click", ".fileReName", function (e) {
reNameSpecially();
$(".layui-dropdown-menu").hide();
});
// 文件名保存
$("body").on("click", ".filename-edit-save", function (e) {
if(isNull($(this).parent().find('textarea').val())) {
winui.window.msg('请填写文件名', {icon: 2, time: 2000});
} else {
$(this).parent().parent().css({"z-index": 0});
editFolderById($(this).parent());
}
});
// 文件名取消修改
$("body").on("click", ".filename-edit-cancle", function (e) {
$(this).parent().parent().css({"z-index": 0});
$(this).parent().parent().find("div[class='filename']").show();
$(this).parent().hide();
});
// 文件夹或者文件删除
$("body").on("click", ".deleteFolderAndChild", function (e) {
// 树操作--文件夹或者文件删除
$("body").on("click", ".treedeleteFolderAndChild", function (e) {
hideRMenu();
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
layer.close(index);
var checkItems = $("#file-content .menu-folder .item-select .item-check").find("input:checkbox[name='checkFile']:checked");
var deleteArray = new Array();
$.each(checkItems, function(i, item) {
var checkFile = $(item).parent().parent().parent();
deleteArray.push({
id: checkFile.attr("rowid"),
fileType: checkFile.attr("filetype")
});
});
$(".layui-dropdown-menu").hide();
$(".select-op-more").hide();
//如果选中项为空
if(deleteArray.length == 0){
winui.window.msg('请选择要删除的文件或文件夹', {icon: 2, time: 2000});
return false;
}
deleteFolderAndChild(deleteArray, function() {
// 刷新节点
refreshTreePointNode();
// 加载该目录下的文件
loadThisFolderChild();
});
clickType = 'folder';
deleteFileOrNote(folderId);
});
});
// // 删除文件夹以及该文件夹下的所有子内容
// function deleteFolderAndChild(deleteArray, callBack){
// AjaxPostUtil.request({url: sysMainMation.diskCloudBasePath + "fileconsole004", params: {fileList: JSON.stringify(deleteArray)}, type: 'json', method: 'POST', callback: function (json) {
// winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
// callBack();
// }});
// }
// 新建
$("body").on("click", "#createNewFolder", function (e) {
hideRMenu();
createFolder(folderId, refreshTreePointNode, initMenuToBox, currentUserId);
});
// 删除指定文件夹或笔记
function deleteFileOrNote(id){
AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deleteDepotLevelById", params: {id: id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
var selNode = ztree.getNodeByParam("id", id, null);
ztree.selectNode(selNode.getParentNode());// 设置选中节点
// 重置folderid
folderId = selNode.getParentNode().id;
ztree.removeNode(selNode);// 移除节点
// showListById();// 获取文件夹和笔记列表
}});
}
// 树操作--新建
$("body").on("click", ".treecreateNewFolder", function (e) {
hideRMenu();
loadThisFolderChild();
createFolder(folderId, refreshTreePointNode, initMenuToBox, currentUserId);
// 打开一个新建布局
_openNewWindows({
url: "../../tpl/turnIocatorManage/addWarehouseLevel.html?id=" + id,
title: "新增仓库级别",
pageId: "addWarehouseLevel",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 树操作--刷新
$("body").on("click", ".treerefreshContent", function (e) {
refreshTreePointNode();
loadThisFolderChild();
});
// 默认初始化树
var initTreeSel = false;
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
initRightMenu();
//初始化右键
function initRightMenu() {
$("body").contextMenu({
width: 190, // width
itemHeight: 30, // 菜单项height
bgColor: "#FFFFFF", // 背景颜色
color: "#0A0A0A", // 字体颜色
fontSize: 12, // 字体大小
hoverBgColor: "#99CC66", // hover背景颜色
target: function(ele) { // 当前元素
},
menu: [{
text: "新建",
img: "../../assets/images/icon/create-folder-icon.png",
callback: function() {
createFolder(folderId, refreshTreePointNode, initMenuToBox, currentUserId);
}
}, { // 菜单项
text: "新建文件",
img: "../../assets/images/my-file-icon.png",
children: [{
text: "txt文件",
img: "../../assets/images/txt-icon.png",
callback: function() {
createNumpyFile("txt", folderId, loadThisFolderChild());
}
}, {
text: "html文件",
img: "../../assets/images/icon/html-icon.png",
callback: function() {
createNumpyFile("html", folderId, loadThisFolderChild());
}
}, {
text: "--"
}]
}, {
text: "--"
}, {
text: "--"
}, {
text: "刷新",
img: "../../assets/images/refresh-icon.png",
callback: function() {
loadThisFolderChild();
}
}
]
});
function loadTable() {
table.reload("messageTable", {where: getTableParams()});
}
// 负责view的销毁
function removeOneFile(file) {
var $li = $('#' + file.id);
delete percentages[file.id];
updateAllTotalProgress();
$li.off().find('.file-panel').off().end().remove();
function getTableParams() {
return $.extend(true, {objectKey:objectKey,objectId:objectId}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('turnIocatorManage', {});
......
......@@ -52,6 +52,11 @@
<a class="layui-btn layui-btn-xs" lay-event="turnReturns">转销售退货</a>
{{# } }}
{{# } }}
{{# if(d.state == 'partiallyCompleted') { }}
{{# if(auth('')){ }}
<a class="layui-btn layui-btn-xs" lay-event="turnReturns">转预生产计划</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 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
<!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
// 以下两个参数开启团队权限时有值
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
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册