提交 0405c615 编写于 作者: W WJ-202301081617\Wlos

feat:里程碑代码优化

上级 b2619df1
...@@ -47,53 +47,53 @@ layui.config({ ...@@ -47,53 +47,53 @@ layui.config({
cols: [[ cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单据编号', width: 200, align: 'center', templet: function (d) { { field: 'oddNumber', title: '单据编号', width: 200, align: 'center', templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>'; return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}}, }},
{ field: 'name', title: '名称', width: 200 }, { field: 'name', title: '名称', width: 200 },
{ field: 'startTime', title: '开始时间', align: 'center', width: 100 }, { field: 'startTime', title: '开始时间', align: 'center', width: 100 },
{ field: 'endTime', title: '结束时间', align: 'center', width: 100 }, { field: 'endTime', title: '结束时间', align: 'center', width: 100 },
{ field: 'imported', title: '重要性', width: 90, templet: function (d) { { field: 'imported', title: '重要性', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("milestoneImported", 'id', d.imported, 'name'); return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("milestoneImported", 'id', d.imported, 'name');
}}, }},
{ field: 'state', title: '状态', width: 90, templet: function (d) { { field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("milestoneStateEnum", 'id', d.state, 'name'); return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("milestoneStateEnum", 'id', d.state, 'name');
}}, }},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 }, { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, { 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: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 }, { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, templet: function (d) { { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, templet: function (d) {
var str = ''; var str = '';
if (d.editRow == 1) { if (d.editRow == 1) {
if (authPermission['submitToApproval']) { if (authPermission['submitToApproval']) {
str += '<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>'; str += '<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>';
}
if (authPermission['edit']) {
str += '<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>';
}
if (authPermission['delete']) {
str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">删除</a>';
}
if (authPermission['invalid']) {
str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>';
}
} }
if (d.editRow == 2 && d.state == 'inExamine') { if (authPermission['edit']) {
if (authPermission['revoke']) { str += '<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>';
str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>';
}
} }
if (d.state == 'pass' && authPermission['executing']) { if (authPermission['delete']) {
str += '<a class="layui-btn layui-btn-xs" lay-event="executionBegin">执行</a>'; str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">删除</a>';
} }
if (d.state == 'executing' && authPermission['completed']) { if (authPermission['invalid']) {
str += '<a class="layui-btn layui-btn-xs" lay-event="executionOver">完成</a>'; str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>';
} }
if (d.state == 'completed' && authPermission['close']) { }
str += '<a class="layui-btn layui-btn-xs" lay-event="executionClose">关闭</a>'; if (d.editRow == 2 && d.state == 'inExamine') {
if (authPermission['revoke']) {
str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>';
} }
return str; }
}} if (d.state == 'pass' && authPermission['executing']) {
str += '<a class="layui-btn layui-btn-xs" lay-event="executionBegin">执行</a>';
}
if (d.state == 'executing' && authPermission['completed']) {
str += '<a class="layui-btn layui-btn-xs" lay-event="executionOver">完成</a>';
}
if (d.state == 'completed' && authPermission['close']) {
str += '<a class="layui-btn layui-btn-xs" lay-event="executionClose">关闭</a>';
}
return str;
}}
]], ]],
done: function(json) { done: function(json) {
matchingLanguage(); matchingLanguage();
...@@ -118,13 +118,13 @@ layui.config({ ...@@ -118,13 +118,13 @@ layui.config({
activitiUtil.activitiDetails(data); activitiUtil.activitiDetails(data);
} else if (layEvent === 'executionBegin') {//开始执行 } else if (layEvent === 'executionBegin') {//开始执行
executionBegin(data, obj); executionBegin(data, obj);
} else if (layEvent === 'revoke') {//撤销任务审批申请 } else if (layEvent === 'revoke') {//撤销里程碑审批申请
revoke(data); revoke(data);
} else if (layEvent === 'cancellation') {//作废 } else if (layEvent === 'cancellation') {//作废
cancellation(data, obj); cancellation(data, obj);
} else if (layEvent === 'executionOver') {//执行完成 } else if (layEvent === 'executionOver') {//执行完成
executionOver(data, obj); executionOver(data, obj);
} else if (layEvent === 'executionClose') {//任务关闭 } else if (layEvent === 'executionClose') {//里程碑关闭
executionClose(data, obj); executionClose(data, obj);
} }
}); });
...@@ -134,7 +134,7 @@ layui.config({ ...@@ -134,7 +134,7 @@ layui.config({
_openNewWindows({ _openNewWindows({
url: systemCommonUtil.getUrl('FP2024061500001&objectId=' + objectId + '&objectKey=' + objectKey, null), url: systemCommonUtil.getUrl('FP2024061500001&objectId=' + objectId + '&objectKey=' + objectKey, null),
title: "新增里程碑", title: "新增里程碑",
pageId: "promilestoneadd", pageId: "proMilestoneAdd",
area: ['90vw', '90vh'], area: ['90vw', '90vh'],
callBack: function (refreshCode) { callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
...@@ -146,12 +146,10 @@ layui.config({ ...@@ -146,12 +146,10 @@ layui.config({
function details(data) { function details(data) {
_openNewWindows({ _openNewWindows({
url: systemCommonUtil.getUrl('FP2024061500006&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null), url: systemCommonUtil.getUrl('FP2024061500006&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
title: "任务详情", title: "里程碑详情",
pageId: "promilestonedetails", pageId: "proMilestoneDetails",
area: ['90vw', '90vh'], area: ['90vw', '90vh']
callBack: function (refreshCode) { });
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
}});
} }
// 编辑 // 编辑
...@@ -174,9 +172,9 @@ layui.config({ ...@@ -174,9 +172,9 @@ layui.config({
layer.confirm(msg, { icon: 3, title: '里程碑开始执行' }, function (index) { layer.confirm(msg, { icon: 3, title: '里程碑开始执行' }, function (index) {
layer.close(index); layer.close(index);
AjaxPostUtil.request({url: sysMainMation.projectBasePath + "executionMilestone", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) { AjaxPostUtil.request({url: sysMainMation.projectBasePath + "executionMilestone", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable(); loadTable();
}}); }});
}); });
} }
...@@ -186,9 +184,9 @@ layui.config({ ...@@ -186,9 +184,9 @@ layui.config({
layer.confirm(msg, { icon: 3, title: '里程碑执行完成' }, function (index) { layer.confirm(msg, { icon: 3, title: '里程碑执行完成' }, function (index) {
layer.close(index); layer.close(index);
AjaxPostUtil.request({url: sysMainMation.projectBasePath + "complateMilestone", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) { AjaxPostUtil.request({url: sysMainMation.projectBasePath + "complateMilestone", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable(); loadTable();
}}); }});
}); });
} }
...@@ -198,9 +196,9 @@ layui.config({ ...@@ -198,9 +196,9 @@ layui.config({
layer.confirm(msg, { icon: 3, title: '关闭里程碑' }, function (index) { layer.confirm(msg, { icon: 3, title: '关闭里程碑' }, function (index) {
layer.close(index); layer.close(index);
AjaxPostUtil.request({url: sysMainMation.projectBasePath + "closeMilestone", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) { AjaxPostUtil.request({url: sysMainMation.projectBasePath + "closeMilestone", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable(); loadTable();
}}); }});
}); });
} }
...@@ -210,9 +208,9 @@ layui.config({ ...@@ -210,9 +208,9 @@ layui.config({
layer.confirm(msg, { icon: 3, title: '撤销里程碑审批申请' }, function (index) { layer.confirm(msg, { icon: 3, title: '撤销里程碑审批申请' }, function (index) {
layer.close(index); layer.close(index);
AjaxPostUtil.request({url: sysMainMation.projectBasePath + "revokeMilestone", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', callback: function (json) { AjaxPostUtil.request({url: sysMainMation.projectBasePath + "revokeMilestone", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000}); winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable(); loadTable();
}}); }});
}); });
} }
...@@ -226,9 +224,9 @@ layui.config({ ...@@ -226,9 +224,9 @@ layui.config({
approvalId: approvalId approvalId: approvalId
}; };
AjaxPostUtil.request({url: sysMainMation.projectBasePath + "submitToApprovalMilestone", params: params, type: 'json', method: 'POST', callback: function (json) { AjaxPostUtil.request({url: sysMainMation.projectBasePath + "submitToApprovalMilestone", params: params, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000}); winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable(); loadTable();
}}); }});
}); });
}); });
} }
...@@ -239,9 +237,9 @@ layui.config({ ...@@ -239,9 +237,9 @@ layui.config({
layer.confirm(msg, { icon: 3, title: '里程碑作废' }, function (index) { layer.confirm(msg, { icon: 3, title: '里程碑作废' }, function (index) {
layer.close(index); layer.close(index);
AjaxPostUtil.request({url: sysMainMation.projectBasePath + "invalidMilestone", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) { AjaxPostUtil.request({url: sysMainMation.projectBasePath + "invalidMilestone", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable(); loadTable();
}}); }});
}); });
} }
...@@ -250,10 +248,10 @@ layui.config({ ...@@ -250,10 +248,10 @@ layui.config({
var msg = obj ? '确认删除【' + obj.data.name + '】吗?' : '确认删除选中数据吗?'; var msg = obj ? '确认删除【' + obj.data.name + '】吗?' : '确认删除选中数据吗?';
layer.confirm(msg, {icon: 3, title: '删除里程碑'}, function (index) { layer.confirm(msg, {icon: 3, title: '删除里程碑'}, function (index) {
layer.close(index); layer.close(index);
AjaxPostUtil.request({url: sysMainMation.projectBasePath + "deleteMilestoneById", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) { AjaxPostUtil.request({url: sysMainMation.projectBasePath + "deleteMilestoneById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable(); loadTable();
}}); }});
}); });
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册