Skip to content

S
Skyeye

Skyeye云 / Skyeye

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

IFS明细账分类对接数据字典

上级 6d6719af
隐藏空白更改
内联 并排
Showing with 104 addition and 307 deletion
README.md
浏览文件 @ 1a239c23
......@@ -66,5 +66,3 @@
| ![](images/show/tradition/show008.png) | ![](images/show/win10/show008.png) |
| ![](images/show/tradition/show009.png) | ![](images/show/win10/show009.png) |
| ![](images/show/tradition/show010.png) | ![](images/show/win10/show010.png) |
dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationChooseByFirstTypeCode.js 已删除 100644 → 0
浏览文件 @ 6d6719af
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'form', 'fsCommon', 'fsTree'], function (exports) {
var index = parent.layer.getFrameIndex(window.name);
winui.renderColor();
var $ = layui.$,
form = layui.form,
fsTree = layui.fsTree,
fsCommon = layui.fsCommon;
var firstTypeCode = GetUrlParam("firstTypeCode");
// todo 待替换
/********* tree 处理 start *************/
var orderType = "";
var ztree = null;
fsTree.render({
id: "treeDemo",
url: flowableBasePath + "dsFormObjectRelation007?firstTypeCode=" + firstTypeCode + "&language=" + languageType,
clickCallback: onClickTree,
onDblClick: onClickTree
}, function(id){
ztree = $.fn.zTree.getZTreeObj(id);
});
var chooseNode = null;
// 异步加载的方法
function onClickTree(event, treeId, treeNode) {
if(treeNode == undefined) {
orderType = "";
} else {
if(treeNode.isParent != 0){
return;
}
chooseNode = treeNode;
}
}
/********* tree 处理 end *************/
matchingLanguage();
form.render();
form.on('submit(formChooseBean)', function(data) {
if(winui.verifyForm(data.elem)) {
if(isNull(chooseNode)){
winui.window.msg("请选择单据类型.", {icon: 2, time: 2000});
return false;
}
parent.dsFormUtil.dsFormObjectRelationChoose = chooseNode;
parent.layer.close(index);
parent.refreshCode = '0';
}
return false;
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
exports('dsFormObjectRelationChooseByFirstTypeCode', {});
});
dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationChooseByFirstTypeCode.html 已删除 100644 → 0
浏览文件 @ 6d6719af
<!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" />
<link href="../../assets/lib/layui/lay/modules/ztree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet" />
<link href="../../assets/lib/layui/lay/modules/contextMenu/jquery.contextMenu.min.css" rel="stylesheet" />
</head>
<body>
<div style="margin: 0 auto; padding: 20px;">
<form class="layui-form" action="" id="showForm" autocomplete="off">
<div class="layui-form-item layui-col-xs12">
<div style="width: 100%; float: left;">
<ul id="treeDemo" class="ztree fsTree" method="get" isRoot="1" treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name"></ul>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle" type="button"><language showName="com.skyeye.cancel"></language></button>
<button class="winui-btn" lay-submit lay-filter="formChooseBean">选择</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" 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">
layui.config({base: '../../js/dsFormObjectRelation/'}).use('dsFormObjectRelationChooseByFirstTypeCode');
</script>
</body>
</html>
\ No newline at end of file
ifs/src/main/resources/template/js/income/incomeAdd.js
浏览文件 @ 1a239c23
......@@ -18,6 +18,8 @@ layui.config({
// 获取单据提交类型
var submitType = erpOrderUtil.getSubmitTypeByKey(serviceClassName);
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", serviceClassName, null);
var selOption = getFileContent('tpl/template/select-option.tpl');
var handsPersonList = new Array();//经手人员
......@@ -30,6 +32,8 @@ layui.config({
$("#accountId").html(getDataUseHandlebars(selOption, json));
});
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["ifsOrderType"]["key"], 'radioTree', "ifsOrderType", '', form);
// 初始化列表项选择
voucherUtil.init('showVoucherUtilBox');
......@@ -63,13 +67,18 @@ layui.config({
function saveData(subType, approvalId) {
var result = voucherUtil.getData();
if(result.length < 2){
if (result.length < 2) {
return false;
}
var ifsOrderType = $("#ifsOrderType").attr("chooseId");
if (isNull(ifsOrderType)) {
winui.window.msg('请选择单据类型', {icon: 2, time: 2000});
return false;
}
var params = {
organType: $("#correspondentUnitType").val(),
organId: getOrganId(),
type: dsFormUtil.dsFormObjectRelationChoose.id,
type: ifsOrderType,
handsPersonId: handsPersonList[0].id,
operTime: $("#operTime").val(),
accountId: $("#accountId").val(),
......@@ -154,17 +163,6 @@ layui.config({
});
});
// 选择单据类型
$("body").on("click", "#chooseOrderTypeBtn", function (e) {
var _this = $(this);
dsFormUtil.openDsFormObjectRelationChooseByFirstTypeCodeChoosePage("IFS", function (dsFormObjectRelationChoose){
_this.parent().find("input").val(dsFormObjectRelationChoose.name);
$("#dsFormShow").html("");
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", null, dsFormObjectRelationChoose.id);
});
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
......
ifs/src/main/resources/template/js/income/incomeEdit.js
浏览文件 @ 1a239c23
......@@ -57,12 +57,6 @@ layui.config({
name: json.bean.setOfBooksName
};
// 类型
dsFormUtil.dsFormObjectRelationChoose = {
id: json.bean.type,
name: json.bean.typeName
};
erpOrderUtil.orderEditPageSetBtnBySubmitType(submitType, json.bean.state);
// 加载动态表单
......@@ -90,7 +84,6 @@ layui.config({
function initOtherMation(data) {
// 初始化账户
systemCommonUtil.getSysAccountListByType(function (json) {
// 加载账户数据
$("#accountId").html(getDataUseHandlebars(selOption, json));
$("#accountId").val(data.bean.accountId);
});
......@@ -144,7 +137,7 @@ layui.config({
var params = {
organType: $("#correspondentUnitType").val(),
organId: getOrganId(),
type: dsFormUtil.dsFormObjectRelationChoose.id,
type: $("#ifsOrderType").attr("chooseId"),
handsPersonId: handsPersonList[0].id,
operTime: $("#operTime").val(),
accountId: $("#accountId").val(),
......@@ -221,17 +214,6 @@ layui.config({
});
});
// 选择单据类型
$("body").on("click", "#chooseOrderTypeBtn", function (e) {
var _this = $(this);
dsFormUtil.openDsFormObjectRelationChooseByFirstTypeCodeChoosePage("IFS", function (dsFormObjectRelationChoose){
_this.parent().find("input").val(dsFormObjectRelationChoose.name);
$("#dsFormShow").html("");
// 加载动态表单
dsFormUtil.loadPageByCode("dsFormShow", null, dsFormObjectRelationChoose.id);
});
});
$("body").on("click", "#cancle", function() {
parent.layer.close(index);
});
......
ifs/src/main/resources/template/js/income/incomeList.js
浏览文件 @ 1a239c23
......@@ -6,109 +6,88 @@ layui.config({
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate', 'fsCommon', 'fsTree'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
laydate = layui.laydate,
fsTree = layui.fsTree,
fsCommon = layui.fsCommon,
table = layui.table;
var serviceClassName = sysServiceMation["incomeOrder"]["key"];
authBtn('1571638020191');//新增
authBtn('1572313776196');//导出
laydate.render({elem: '#billTime', range: '~'});
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'income001',
where: getTableParams(),
even: true,
page: true,
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: '审批模式', align: 'center', colspan: '2'},
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function (d) {
return activitiUtil.showStateName2(d.state, d.submitType);
}},
{ 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: 'processInstanceId', title: '流程实例id', align: 'left', width: 120, templet: function (d) {
return erpOrderUtil.getProcessInstanceIdBySubmitType(d);
}}
]],
done: function(json) {
matchingLanguage();
}
var type = "";
sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["ifsOrderType"]["key"], 'selectTree', "ifsOrderType", '', form, function () {
initTable();
}, function (chooseId) {
type = chooseId;
refreshTable();
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'delete') { //删除
deleteIncome(data);
} else if (layEvent === 'details') { //详情
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') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
revorke(data);
}
});
/********* tree 处理 start *************/
// todo 待替换
var orderType = "";
var ztree = null;
fsTree.render({
id: "treeDemo",
url: flowableBasePath + "dsFormObjectRelation007?firstTypeCode=IFS" + "&language=" + languageType,
clickCallback: onClickTree,
onDblClick: onClickTree
}, function(id){
ztree = $.fn.zTree.getZTreeObj(id);
initLoadTable();
});
function initTable() {
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'income001',
where: getTableParams(),
even: true,
page: true,
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: '审批模式', align: 'center', colspan: '2' },
{ field: 'state', title: '状态', align: 'left', rowspan: '2', width: 80, templet: function (d) {
return activitiUtil.showStateName2(d.state, d.submitType);
}},
{ 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: 'processInstanceId', title: '流程实例id', align: 'left', width: 120, templet: function (d) {
return erpOrderUtil.getProcessInstanceIdBySubmitType(d);
}}
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
// 异步加载的方法
function onClickTree(event, treeId, treeNode) {
if(treeNode == undefined) {
orderType = "";
} else {
if(treeNode.id != 0 && treeNode.isParent != 0){
return;
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'delete') { //删除
deleteIncome(data);
} else if (layEvent === 'details') { //详情
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') { // 工作流流程详情查看
activitiUtil.activitiDetails(data);
} else if (layEvent === 'revoke') { //撤销
revorke(data);
}
// 订单类型
orderType = treeNode.id == 0 ? "" : treeNode.id;
}
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()})
});
}
/********* tree 处理 end *************/
// 编辑
function edit(data) {
......@@ -200,45 +179,30 @@ layui.config({
}});
});
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()})
}
return false;
// 导出excel
$("body").on("click", "#downloadExcel", function () {
postDownLoadFile({
url : flowableBasePath + 'income007',
params: getTableParams(),
method : 'post'
});
});
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
// 刷新
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
// 导出excel
$("body").on("click", "#downloadExcel", function () {
postDownLoadFile({
url : flowableBasePath + 'income007',
params: getTableParams(),
method : 'post'
});
});
function refreshTable(){
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
}
function getTableParams() {
var startTime = "";
var endTime = "";
if (!isNull($("#billTime").val())) {
startTime = $("#billTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#billTime").val().split('~')[1].trim() + ' 23:59:59';
}
return {
billNo: $("#billNo").val(),
type: orderType,
startTime: startTime,
endTime: endTime
};
$.extend(true, {type: type}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('incomeList', {});
......
ifs/src/main/resources/template/tpl/income/incomeAdd.html
浏览文件 @ 1a239c23
......@@ -41,9 +41,8 @@
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">类型<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="orderType" name="orderType" win-verify="required" placeholder="请选择类型" class="layui-input" readonly="readonly"/>
<i class="fa fa-plus-circle input-icon" id="chooseOrderTypeBtn"></i>
<div class="layui-input-block" id="ifsOrderType">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
......
ifs/src/main/resources/template/tpl/income/incomeEdit.html
浏览文件 @ 1a239c23
......@@ -48,9 +48,8 @@
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">类型<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="orderType" name="orderType" win-verify="required" placeholder="请选择类型" class="layui-input" readonly="readonly" value="{{typeName}}"/>
<i class="fa fa-plus-circle input-icon" id="chooseOrderTypeBtn"></i>
<div class="layui-input-block ver-center" chooseId="{{type}}">
{{typeName}}
</div>
</div>
<div class="layui-form-item layui-col-xs12">
......
ifs/src/main/resources/template/tpl/income/incomeList.html
浏览文件 @ 1a239c23
......@@ -5,40 +5,20 @@
<title></title>
<link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
<link href="../../assets/lib/layui/lay/modules/ztree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet" />
<link href="../../assets/lib/layui/lay/modules/contextMenu/jquery.contextMenu.min.css" rel="stylesheet" />
</head>
<body>
<div class="txtcenter" style="margin: 0 auto; padding-top: 10px;">
<form class="layui-form layui-form-pane" action="" autocomplete="off">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">单据编号</label>
<div class="layui-input-inline">
<input type="text" id="billNo" name="billNo" placeholder="请输入单据编号" class="layui-input" />
</div>
<label class="layui-form-label">单据日期</label>
<div class="layui-input-inline">
<input type="text" id="billTime" name="billTime" placeholder="请选择单据日期" class="layui-input" />
</div>
<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
</div>
</div>
</form>
</div>
<div class="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="addBean" class="winui-toolbtn" auth="1571638020191"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
<button id="downloadExcel" class="winui-toolbtn" auth="1572313776196"><i class="fa fa-download" aria-hidden="true"></i><language showName="com.skyeye.exportExcel"></language></button>
<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="1571638020191"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
<button id="downloadExcel" class="winui-toolbtn search-table-btn-right" auth="1572313776196"><i class="fa fa-download" aria-hidden="true"></i><language showName="com.skyeye.exportExcel"></language></button>
</div>
</div>
<div class="layui-row">
<div style="width: 150px; float: left;">
<ul id="treeDemo" class="ztree fsTree" method="get" isRoot="1" treeIdKey="id" inputs="parentId" treePIdKey="pId" clickCallbackInputs="parentId:$id" treeName="name"></ul>
<div style="margin: auto 10px; height: calc(100% - 50px);">
<div style="width: 200px; float: left; height: 100%; overflow-y: auto;" id="ifsOrderType">
</div>
<div style="width: calc(100% - 150px); float: left;">
<div style="width: calc(100% - 200px); float: left;">
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
</div>
......@@ -83,9 +63,6 @@
<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">
layui.config({base: '../../js/income/'}).use('incomeList');
</script>
......
web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js
浏览文件 @ 1a239c23
......@@ -332,24 +332,4 @@ var dsFormUtil = {
}, async: false});
},
/**
* 业务逻辑与动态表单的关联关系类型，也可叫单据类型
*
* @param firstTypeCode 所属一级分类的code
* @param callback 回调函数
*/
dsFormObjectRelationChoose: {}, // 已经选择的单据类型
openDsFormObjectRelationChooseByFirstTypeCodeChoosePage: function (firstTypeCode, callback) {
_openNewWindows({
url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationChooseByFirstTypeCode.html?firstTypeCode=" + firstTypeCode,
title: "单据类型",
pageId: "dsFormObjectRelationChooseByFirstTypeCodePage",
area: ['480px', '500px'],
callBack: function (refreshCode) {
if(typeof(callback) == "function") {
callback(dsFormUtil.dsFormObjectRelationChoose);
}
}});
},
};
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或