Skip to content

S
Skyeye

doc_wei / Skyeye

通知 1195
Star 154
Fork 127
S
Skyeye
提交 87b6bdcb 编写于 作者: L LAPTOP-UV1MNL38\18023
浏览文件
操作

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

上级 fc42e93b 7e67b74c
隐藏空白更改
内联 并排
Showing with 424 addition and 9 deletion
common/src/main/resources/template/js/dsFormPage/writePage.js
浏览文件 @ 87b6bdcb
......@@ -112,8 +112,6 @@ layui.config({
$("#actFlowId").html(getDataUseHandlebars(`{{#each rows}}<option value="{{id}}">{{flowName}}</option>{{/each}}`, json));
if (!isNull(data.actFlowId)) {
$("#actFlowId").val(data.actFlowId);
// 禁止更换流程
$("#actFlowId").attr("disabled", true);
}
form.render('select');
}, async: false});
......
erp/src/main/resources/template/js/holder/holderNormsChildList.js 0 → 100644
浏览文件 @ 87b6bdcb
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;
// 关联的客户/供应商/会员购买或者出售的商品link的id
var id = getNotUndefinedVal(GetUrlParam("id"));
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.erpBasePath + 'queryHolderNormsChildList',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'normsCodeNum', title: '编码', align: 'left', width: 180, templet: function (d) {
return d.normsCodeNum;
}},
{ field: 'barCodeMation', title: '条形码', align: 'center', width: 150, templet: function (d) {
return '<img src="' + systemCommonUtil.getFilePath(d.normsCodeMation?.barCodeMation?.imagePath) + '" class="photo-img" lay-event="barCode" style="width: 100px">';
}},
{ field: 'state', title: '状态', align: 'center', width: 100, templet: function(d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("holderNormsChildState", 'id', d.state, 'name');
}},
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 120, 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 === 'barCode') { // 条形码预览
systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.normsCodeMation?.barCodeMation?.imagePath));
}
});
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
let params = {
holderId: id
}
return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('holderNormsChildList', {});
});
erp/src/main/resources/template/js/holder/holderNormsList.js
浏览文件 @ 87b6bdcb
......@@ -31,12 +31,21 @@ layui.config({
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'materialId', title: '产品名称', align: 'left',width: 150, templet: function (d) {
{ field: 'materialId', title: '产品名称', align: 'left', width: 150, templet: function (d) {
return getNotUndefinedVal(d.materialMation?.name);
}},
{ field: 'normsId', title: '产品规格', align: 'left',width: 400, templet: function (d) {
{ field: 'normsId', title: '产品规格', align: 'left', width: 150, templet: function (d) {
return getNotUndefinedVal(d.normsMation?.name);
}}
}},
{ field: 'operNumber', title: '交易数量', align: 'center', width: 90, templet: function (d) {
let itemCode = d.materialMation?.itemCode;
if (itemCode == 1) {
// 一物一码
return '<a lay-event="details" class="notice-title-click">' + d.operNumber + '</a>';
}
return getNotUndefinedVal(d.operNumber);
}},
{ field: 'createTime', title: '交易时间', align: 'center', width: 150 }
]],
done: function(json) {
matchingLanguage();
......@@ -49,8 +58,22 @@ layui.config({
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'details') { // 详情
details(data);
}
});
// 详情
function details(data) {
_openNewWindows({
url: '../../tpl/holder/holderNormsChildList.html?id=' + data.id,
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "holderNormsChildList",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
......
erp/src/main/resources/template/tpl/holder/holderNormsChildList.html 0 → 100644
浏览文件 @ 87b6bdcb
<!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/holder/'}).use('holderNormsChildList');
</script>
</body>
</html>
\ No newline at end of file
pro/src/main/resources/template/js/milestone/milestoneList.js
浏览文件 @ 87b6bdcb
var objectKey = "";
var objectId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'form', 'table'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
objectKey = GetUrlParam("objectKey");
objectId = GetUrlParam("objectId");
if (isNull(objectKey) || isNull(objectId)) {
winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
return false;
}
var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'milestoneAuthEnum');
var btnStr = `<div style="" class="type-group" id="type">`;
var firstBtn = true;
if (authPermission['list']) {
var defaultClassName = firstBtn ? 'plan-select' : '';
firstBtn = false;
btnStr += `<button type="button" class="layui-btn layui-btn-primary type-btn ${defaultClassName}" data-type="list" table-id="messageTable"><i class="layui-icon"></i>所有里程碑</button>`
}
if (authPermission['myCreate']) {
var defaultClassName = firstBtn ? 'plan-select' : '';
btnStr += `<button type="button" class="layui-btn layui-btn-primary type-btn ${defaultClassName}" data-type="myCreate" table-id="messageTable"><i class="layui-icon"></i>我创建的里程碑</button>`
}
btnStr += `</div>`;
$(".winui-toolbar").before(btnStr);
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: sysMainMation.projectBasePath + 'queryMilestoneList',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单据编号', width: 200, align: 'center', templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ field: 'name', title: '名称', width: 200 },
{ field: 'startTime', title: '开始时间', align: 'center', width: 100 },
{ field: 'endTime', title: '结束时间', align: 'center', width: 100 },
{ field: 'imported', title: '重要性', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("milestoneImported", 'id', d.imported, 'name');
}},
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("milestoneStateEnum", 'id', d.state, 'name');
}},
{ 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: '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: 250, templet: function (d) {
var str = '';
if (d.editRow == 1) {
if (authPermission['submitToApproval']) {
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['revoke']) {
str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>';
}
}
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) {
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 === 'details'){ //详情
details(data);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'del'){ //删除
del(data, obj);
} else if (layEvent === 'subApproval') { //提交审批
subApproval(data, obj);
} else if (layEvent === 'processDetails') {//流程详情
activitiUtil.activitiDetails(data);
} else if (layEvent === 'executionBegin') {//开始执行
executionBegin(data, obj);
} else if (layEvent === 'revoke') {//撤销任务审批申请
revoke(data);
} else if (layEvent === 'cancellation') {//作废
cancellation(data, obj);
} else if (layEvent === 'executionOver') {//执行完成
executionOver(data, obj);
} else if (layEvent === 'executionClose') {//任务关闭
executionClose(data, obj);
}
});
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024061500001&objectId=' + objectId + '&objectKey=' + objectKey, null),
title: "新增里程碑",
pageId: "promilestoneadd",
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('FP2024061500006&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
title: "任务详情",
pageId: "promilestonedetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
}});
}
// 编辑
function edit(data) {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2024061500002&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
title: "编辑里程碑",
pageId: "promilestoneedit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}
});
}
// 开始执行里程碑
function executionBegin(data, obj){
var msg = obj ? '确认开始执行【' + obj.data.name + '】吗？' : '确认开始执行该里程碑吗？';
layer.confirm(msg, { icon: 3, title: '里程碑开始执行' }, function (index) {
layer.close(index);
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});
loadTable();
}});
});
}
//执行完成里程碑
function executionOver(data, obj){
var msg = obj ? '确认执行完成【' + obj.data.name + '】吗？' : '确认执行完成该里程碑吗？';
layer.confirm(msg, { icon: 3, title: '里程碑执行完成' }, function (index) {
layer.close(index);
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});
loadTable();
}});
});
}
// 里程碑关闭
function executionClose(data, obj){
var msg = obj ? '确认关闭【' + obj.data.name + '】吗？' : '确认关闭该里程碑吗？';
layer.confirm(msg, { icon: 3, title: '关闭里程碑' }, function (index) {
layer.close(index);
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});
loadTable();
}});
});
}
// 撤销里程碑审批申请
function revoke(data) {
var msg = '确认从工作流中撤销选中数据吗？';
layer.confirm(msg, { icon: 3, title: '撤销里程碑审批申请' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.projectBasePath + "revokeMilestone", params: {processInstanceId: data.processInstanceId}, type: 'json', method: 'PUT', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable();
}});
});
}
// 里程碑提交审批
function subApproval(data, obj){
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.projectBasePath + "submitToApprovalMilestone", params: params, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable();
}});
});
});
}
// 作废里程碑
function cancellation(data, obj){
var msg = obj ? '确认作废【' + obj.data.name + '】吗？' : '确认作废该里程碑信息吗？';
layer.confirm(msg, { icon: 3, title: '里程碑作废' }, function (index) {
layer.close(index);
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});
loadTable();
}});
});
}
// 删除里程碑
function del(data, obj) {
var msg = obj ? '确认删除【' + obj.data.name + '】吗？' : '确认删除选中数据吗？';
layer.confirm(msg, {icon: 3, title: '删除里程碑'}, function (index) {
layer.close(index);
AjaxPostUtil.request({url: sysMainMation.projectBasePath + "deleteMilestoneById", params: {id: data.id}, type: 'json', method: 'POST', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {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, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('milestoneList', {});
});
pro/src/main/resources/template/tpl/milestone/milestoneList.html
浏览文件 @ 87b6bdcb
<!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="add"><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>
</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/milestone/'}).use('milestoneList');
</script>
</body>
</html>
\ No newline at end of file
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ 87b6bdcb
......@@ -56,6 +56,7 @@
"orderItemQualityInspectionType": {"name": "ERP采购子单据质检类型", "className": "skyeye-erp#com.skyeye.business.classenum.OrderItemQualityInspectionType"},
"orderArrivalState": {"name": "采购订单到货状态", "className": "skyeye-erp#com.skyeye.purchase.classenum.OrderArrivalState"},
"holderNormsChildState": {"name": "关联的客户/供应商/会员购买或者出售的商品子信息状态", "className": "skyeye-erp#com.skyeye.holder.classenum.HolderNormsChildState"},
"purchaseOrderFromType": {"name": "采购订单来源单据类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.PurchaseOrderFromType"},
"purchaseDeliveryFromType": {"name": "到货单来源单据类型", "className": "skyeye-erp#com.skyeye.purchase.classenum.PurchaseDeliveryFromType"},
......@@ -77,11 +78,8 @@
"tenantEnum": {"name": "租户类型", "className": "skyeye-pro#com.skyeye.common.enumeration.TenantEnum"},
"milestoneStateEnum": {"name": "里程碑状态", "className": "skyeye-pro#com.skyeye.milestone.classenum.MilestoneStateEnum"},
"milestoneImported": {"name": "里程碑重要性", "className": "skyeye-pro#com.skyeye.milestone.classenum.MilestoneImported"},
"teamObjectType": {"name": "团队适用对象", "className": "skyeye-pro#com.skyeye.team.classenum.TeamObjectTypeEnum"},
"milestoneAuthEnum": {"name": "里程碑权限", "className": "skyeye-pro#com.skyeye.milestone.classenum.MilestoneAuthEnum", "pageUrl": "../../tpl/milestone/milestoneList.html"},
"milestoneAuthEnum": {"name": "里程碑权限", "className": "skyeye-project#com.skyeye.milestone.classenum.MilestoneAuthEnum", "pageUrl": "../../tpl/milestone/milestoneList.html"},
"contactsAuthEnum": {"name": "联系人权限", "className": "skyeye-pro#com.skyeye.contacts.classenum.ContactsAuthEnum", "pageUrl": "../../tpl/contacts/contactsList.html"},
"catalogAuthEnum": {"name": "目录权限", "className": "skyeye-pro#com.skyeye.catalog.classenum.CatalogAuthEnum"},
"documentAuthEnum": {"name": "文档权限", "className": "skyeye-pro#com.skyeye.document.classenum.DocumentAuthEnum", "pageUrl": "../../tpl/document/documentList.html"},
......@@ -92,6 +90,8 @@
"projectStateEnum": {"name": "项目状态", "className": "skyeye-project#com.skyeye.project.classenum.ProjectStateEnum"},
"taskStateEnum": {"name": "项目任务状态", "className": "skyeye-project#com.skyeye.task.classenum.TaskStateEnum"},
"taskAuthEnum": {"name": "项目任务权限", "className": "skyeye-project#com.skyeye.task.classenum.TaskAuthEnum", "pageUrl": "../../tpl/proTask/proTaskList.html"},
"milestoneStateEnum": {"name": "里程碑状态", "className": "skyeye-project#com.skyeye.milestone.classenum.MilestoneStateEnum"},
"milestoneImported": {"name": "里程碑重要性", "className": "skyeye-project#com.skyeye.milestone.classenum.MilestoneImported"},
"dsFormPageType": {"name": "表单布局类型", "className": "skyeye-pro#com.skyeye.dsform.classenum.DsFormPageType"},
"simpleTableWhetherChoose": {"name": "表格类型的布局是否开启选择功能", "className": "skyeye-pro#com.skyeye.dsform.classenum.SimpleTableWhetherChoose"},
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或