Skip to content

S
Skyeye

Skyeye云 / Skyeye

通知 1431
Star 162
Fork 130
S
Skyeye
提交 0c60bb9e 编写于 作者: Skyeye云's avatar Skyeye云
浏览文件
操作

财务明细账代码修改

上级 084842f0
隐藏空白更改
内联 并排
Showing with 72 addition and 101 deletion
ifs/src/main/resources/template/js/ifsVoucher/ifsVoucherListChoose.js
浏览文件 @ 0c60bb9e
......@@ -8,7 +8,8 @@ layui.config({
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$,
form = layui.form;
form = layui.form,
table = layui.table;
$("#showInfo").html("凭证选择规则：双击指定行即可选中。");
......
ifs/src/main/resources/template/js/income/incomeList.js
浏览文件 @ 0c60bb9e
......@@ -34,30 +34,31 @@ layui.config({
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
{ field: 'billNo', title: '单据编号', align: 'left', rowspan: '2', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.billNo + '</a>';
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
}},
{ title: '审批模式', align: 'center', colspan: '2' },
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function (d) {
return activitiUtil.showStateName2(d.state, d.submitType);
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
}},
{ field: 'typeName', title: '类型', rowspan: '2', align: 'left', width: 80 },
{ field: 'organTypeName', title: '往来单类型', rowspan: '2', align: 'left', width: 100 },
{ field: 'supplierName', title: '往来单位', rowspan: '2', align: 'left', width: 150 },
{ field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 },
{ field: 'handsPersonName', title: '经手人', rowspan: '2', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 },
{ field: 'userName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 200, toolbar: '#tableBar' }
],[
{ field: 'submitType', title: '提交模式', align: 'left', width: 120, templet: function (d) {
return erpOrderUtil.getSubmitTypeName(d);
{ field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
}},
{ field: 'processInstanceId', title: '流程实例id', align: 'left', width: 120, templet: function (d) {
return erpOrderUtil.getProcessInstanceIdBySubmitType(d);
}}
{ field: 'type', title: '单据类型', align: 'left', width: 80, templet: function (d) {
return sysDictDataUtil.getDictDataNameByCodeAndKey("IFS_ORDER_TYPE", d.type);
}},
{ field: 'holderKey', title: '往来单位类型', align: 'left', width: 100, templet: function (d) {
return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("correspondentEnterEnum", 'id', d.holderKey, 'name');
}},
{ field: 'supplierName', title: '往来单位', align: 'left', width: 150 },
{ field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
{ field: 'handsPersonName', title: '经手人', align: 'left', width: 120 },
{ field: 'operTime', title: '单据日期', align: 'center', width: 120 },
{ 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' }
]],
done: function(json) {
matchingLanguage();
......@@ -76,11 +77,9 @@ layui.config({
details(data);
} else if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'submitToSave') { //提交
subExamine(data, 'submitToSave');
} else if (layEvent === 'subExamine') { //提交审核
subExamine(data, 'subExamine');
} else if (layEvent === 'activitiProcessDetails') { // 工作流流程详情查看
subExamine(data);
} else if (layEvent === 'processDetails') {//采购流程详情
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
revorke(data);
......@@ -88,11 +87,23 @@ layui.config({
});
}
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: systemCommonUtil.getUrl('FP2023031800001', null),
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "incomeAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 编辑
function edit(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/income/incomeEdit.html",
url: systemCommonUtil.getUrl('FP2023031800002&id=' + data.id, null),
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "incomeEdit",
area: ['90vw', '90vh'],
......@@ -102,16 +113,6 @@ layui.config({
}});
}
// 删除
function deleteIncome(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "income005", params: {rowId: data.id}, type: 'json', method: "DELETE", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
// 详情
function details(data) {
rowId = data.id;
......@@ -124,6 +125,16 @@ layui.config({
}});
}
// 删除
function deleteIncome(data) {
layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "income005", params: {rowId: data.id}, type: 'json', method: "DELETE", callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
// 撤销申请
function revorke(data) {
layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
......@@ -136,47 +147,21 @@ layui.config({
}
// 提交数据
function subExamine(data, type){
function subExamine(data){
layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
layer.close(index);
if(type == 'submitToSave'){
// 直接提交
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
var params = {
rowId: data.id,
approvalId: ""
id: data.id,
approvalId: approvalId
};
subToData(params);
} else {
// 工作流提交
activitiUtil.startProcess(serviceClassName, null, function (approvalId) {
var params = {
rowId: data.id,
approvalId: approvalId
};
subToData(params);
});
}
AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "income008", params: params, type: 'json', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable();
}});
});
});
}
function subToData(params){
AjaxPostUtil.request({url: sysMainMation.ifsBasePath + "income008", params: params, type: 'json', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadTable();
}});
}
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/income/incomeAdd.html",
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "incomeAdd",
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() {
......
ifs/src/main/resources/template/tpl/income/incomeList.html
浏览文件 @ 0c60bb9e
......@@ -25,37 +25,20 @@
</div>
<script type="text/html" id="tableBar">
<!-- 单据提交类型 1.走工作流提交 2.直接提交-->
{{# if(d.submitType == 1){ }}
{{# if(d.editRow == '1'){ }}
{{# if(auth('1642323133958')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subExamine">提交审核</a>
{{# } }}
{{# if(auth('1571638039187')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# if(d.editRow == '1'){ }}
{{# if(auth('1642323133958')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subExamine">提交审批</a>
{{# } }}
{{# if(d.editRow == '1' || d.editRow == '2'){ }}
{{# if(auth('1571638030608')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1571638039187')){ }}
<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('1642323144571')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# if(auth('1571638030608')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# } else if(d.submitType == 2) { }}
{{# if(d.state == 0){ }}
{{# if(auth('1571638030608')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1571638039187')){ }}
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
{{# } }}
{{# if(auth('1642323133958')){ }}
<a class="layui-btn layui-btn-xs" lay-event="submitToSave">提交</a>
{{# } }}
{{# } }}
{{# if(d.editRow == '2'){ }}
{{# if(auth('1642323144571')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
{{# } }}
{{# } }}
</script>
......
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @ 0c60bb9e
......@@ -37,6 +37,8 @@
"catalogAuthEnum": {"name": "目录权限", "className": "skyeye-pro#com.skyeye.catalog.classenum.CatalogAuthEnum"},
"documentAuthEnum": {"name": "文档权限", "className": "skyeye-pro#com.skyeye.document.classenum.DocumentAuthEnum"},
"disCussionAuthEnum": {"name": "讨论帖权限", "className": "skyeye-pro#com.skyeye.discussion.classenum.DisCussionAuthEnum"},
"flowableStateEnum": {"name": "工作流状态", "className": "skyeye-pro#com.skyeye.common.enumeration.FlowableStateEnum"},
"correspondentEnterEnum": {"name": "往来单位类型", "className": "skyeye-pro#com.skyeye.common.enumeration.CorrespondentEnterEnum", "remark": "往来单位的组件中使用"},
"dsFormPageType": {"name": "表单布局类型", "className": "skyeye-pro#com.skyeye.dsform.classenum.DsFormPageType"},
"attrKeyDataType": {"name": "表单布局里面的组件关联的数据类型", "className": "skyeye-pro#com.skyeye.attr.classenum.AttrKeyDataType"},
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或