Skip to content

S
Skyeye

Skyeye云 / Skyeye

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

用品采购申请列表整改

上级 7a985ef0
隐藏空白更改
内联 并排
Showing with 81 addition and 128 deletion
admin-assistant/src/main/resources/template/js/assetArticlesPurchase/assetArticlesPurchaseList.js
浏览文件 @ c8a7b02d
......@@ -5,24 +5,19 @@ layui.config({
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
laydate = layui.laydate,
table = layui.table;
var serviceClassName = sysServiceMation["assetArticlesPurchase"]["key"];
// 新增用品采购
authBtn('1596958747047');
// '用品采购'页面的选取时间段表格
laydate.render({elem: '#caigouCreateTime', range: '~'});
// 展示用品采购列表
// 用品采购列表
table.render({
id: 'caigouTable',
elem: '#caigouTable',
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'assetarticles025',
where: getTableParams(),
......@@ -35,42 +30,48 @@ layui.config({
{ field: 'title', title: '标题', width: 300, templet: function (d) {
return '<a lay-event="caigouDedails" class="notice-title-click">' + d.title + '</a>';
}},
{ field: 'oddNum', title: '单号', width: 200 },
{ field: 'oddNumber', title: '单号', width: 200, align: 'center' },
{ field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
return '<a lay-event="caigouProcessDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
}},
{ field: 'stateName', title: '状态', width: 90, templet: function (d) {
{ field: 'state', title: '状态', width: 90, templet: function (d) {
return activitiUtil.showStateName2(d.state, 1);
}},
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#caigouTableBar'}
{ 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: 257, toolbar: '#messageTableBar' }
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
// 用品采购的操作事件
table.on('tool(caigouTable)', function (obj) {
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'caigouDedails') { //采购详情
caigouDedails(data);
} else if (layEvent === 'caigouEdit') { //编辑采购申请
caigouEdit(data);
} else if (layEvent === 'caigouSubApproval') { //采购提交审批
caigouSubApproval(data);
} else if (layEvent === 'caigouCancellation') {//采购作废
caigouCancellation(data);
} else if (layEvent === 'caigouProcessDetails') {//采购流程详情
if (layEvent === 'details') { //采购详情
details(data);
} else if (layEvent === 'edit') { //编辑采购申请
edit(data);
} else if (layEvent === 'subApproval') { //采购提交审批
subApproval(data);
} else if (layEvent === 'cancellation') {//采购作废
cancellation(data);
} else if (layEvent === 'processDetails') {//采购流程详情
activitiUtil.activitiDetails(data);
} else if (layEvent === 'caigouRevoke') {//撤销采购申请
caigouRevoke(data);
} else if (layEvent === 'revoke') {//撤销采购申请
revoke(data);
}
});
// 添加用品采购
$("body").on("click", "#addCaigouBean", function() {
// 添加
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/assetArticlesPurchase/assetArticlesPurchaseAdd.html",
title: "用品采购申请",
......@@ -78,24 +79,24 @@ layui.config({
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadCaigouTable();
loadmessageTable();
}});
});
// 撤销用品采购
function caigouRevoke(data) {
// 撤销
function revoke(data) {
var msg = '确认撤销该用品采购申请吗？';
layer.confirm(msg, { icon: 3, title: '撤销操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: flowableBasePath + "assetarticles035", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadCaigouTable();
loadmessageTable();
}});
});
}
// 编辑用品采购申请
function caigouEdit(data) {
// 编辑
function edit(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/assetArticlesPurchase/assetArticlesPurchaseEdit.html",
......@@ -104,13 +105,13 @@ layui.config({
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadCaigouTable();
loadmessageTable();
}
});
}
// 用品采购提交审批
function caigouSubApproval(data) {
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(serviceClassName, null, function (approvalId) {
......@@ -120,26 +121,26 @@ layui.config({
};
AjaxPostUtil.request({url: flowableBasePath + "assetarticles027", params: params, type: 'json', callback: function (json) {
winui.window.msg("提交成功", {icon: 1, time: 2000});
loadCaigouTable();
loadmessageTable();
}});
});
});
}
// 用品采购作废
function caigouCancellation(data) {
function cancellation(data) {
var msg = '确认作废该条采购申请吗？';
layer.confirm(msg, { icon: 3, title: '作废操作' }, function (index) {
layer.close(index);
AjaxPostUtil.request({url: flowableBasePath + "assetarticles031", params: {rowId: data.id}, type: 'json', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadCaigouTable();
loadmessageTable();
}});
});
}
// 用品采购详情
function caigouDedails(data) {
function details(data) {
rowId = data.id;
_openNewWindows({
url: "../../tpl/assetArticlesPurchase/assetArticlesPurchaseDetails.html",
......@@ -152,35 +153,16 @@ layui.config({
}
form.render();
form.on('submit(formSearch)', function (data) {
if (winui.verifyForm(data.elem)) {
table.reloadData("caigouTable", {page: {curr: 1}, where: getTableParams()});
}
return false;
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
// 刷新采购数据
$("body").on("click", "#reloadCaigouTable", function() {
loadCaigouTable();
});
// 刷新采购列表数据
function loadCaigouTable(){
table.reloadData("caigouTable", {where: getTableParams()});
}
function getTableParams() {
var startTime = "", endTime = "";
if (!isNull($("#caigouCreateTime").val())) {
startTime = $("#caigouCreateTime").val().split('~')[0].trim() + ' 00:00:00';
endTime = $("#caigouCreateTime").val().split('~')[1].trim() + ' 23:59:59';
}
return {
state: $("#caigouState").val(),
startTime: startTime,
endTime: endTime
};
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('assetArticlesPurchaseList', {});
});
admin-assistant/src/main/resources/template/js/assetArticlesUse/assetArticlesUseList.js
浏览文件 @ c8a7b02d
......@@ -16,8 +16,8 @@ layui.config({
// 用品领用列表
table.render({
id: 'lingyongTable',
elem: '#lingyongTable',
id: 'messageTable',
elem: '#messageTable',
method: 'post',
url: flowableBasePath + 'assetarticles017',
where: getTableParams(),
......@@ -41,17 +41,17 @@ layui.config({
{ 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: 257, toolbar: '#lingyongTableBar' }
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar' }
]],
done: function(json) {
matchingLanguage();
initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号，标题", function () {
table.reloadData("lingyongTable", {page: {curr: 1}, where: getTableParams()});
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
table.on('tool(lingyongTable)', function (obj) {
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'details') { //领用详情
......@@ -73,7 +73,7 @@ layui.config({
$("body").on("click", "#addBean", function() {
_openNewWindows({
url: "../../tpl/assetArticlesUse/assetArticlesUseAdd.html",
title: "添加用品领用申请",
title: "用品领用申请",
pageId: "assetArticlesUseAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
......@@ -156,11 +156,11 @@ layui.config({
loadTable();
});
function loadTable() {
table.reloadData("lingyongTable", {where: getTableParams()});
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {}, initTableSearchUtil.getSearchValue("lingyongTable"));
return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('assetArticlesUseList', {});
......
admin-assistant/src/main/resources/template/tpl/assetArticlesPurchase/assetArticlesPurchaseList.html
浏览文件 @ c8a7b02d
......@@ -7,63 +7,34 @@
<link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
</head>
<body>
<div style="margin:0 auto; height: 100%;">
<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">
<select id="caigouState">
<option value="">全部</option>
<option value="0">草稿</option>
<option value="1">审核中</option>
<option value="2">审核通过</option>
<option value="3">审核不通过</option>
<option value="4">作废</option>
<option value="5">撤销</option>
</select>
</div>
<label class="layui-form-label">申请时间</label>
<div class="layui-input-inline">
<input type="text" id="caigouCreateTime" name="caigouCreateTime" 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 class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<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="1596958747047"><i class="fa fa-plus" aria-hidden="true"></i>用品采购申请</button>
</div>
<div class="winui-toolbar">
<div class="winui-tool" style="text-align: left;">
<button id="reloadCaigouTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
<button id="addCaigouBean" class="winui-toolbtn" auth="1596958747047"><i class="fa fa-plus" aria-hidden="true"></i>用品采购申请</button>
</div>
</div>
<div style="margin:auto 10px;">
<table id="caigouTable" lay-filter="caigouTable"></table>
<script type="text/html" id="caigouTableBar">
{{# if(d.editRow == '1'){ }}
{{# if(auth('1596958867143')){ }}
<a class="layui-btn layui-btn-xs" lay-event="caigouSubApproval">提交审批</a>
{{# } }}
{{# if(auth('1596958874140')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="caigouCancellation">作废</a>
{{# } }}
</div>
<div style="margin:auto 10px;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="messageTableBar">
{{# if(d.editRow == '1'){ }}
{{# if(auth('1596958867143')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
{{# } }}
{{# if(d.editRow == '1' || d.editRow == '2'){ }}
{{# if(auth('1596958822354')){ }}
<a class="layui-btn layui-btn-xs" lay-event="caigouEdit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
{{# if(auth('1596958874140')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
{{# } }}
{{# if(d.editRow == '2'){ }}
{{# if(auth('1596958857521')){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="caigouRevoke">撤销</a>
{{# } }}
{{# if(auth('1596958822354')){ }}
<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
{{# } }}
</script>
</div>
{{# } }}
{{# if(d.editRow == '2'){ }}
{{# if(auth('1596958857521')){ }}
<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">
......
admin-assistant/src/main/resources/template/tpl/assetArticlesUse/assetArticlesUseList.html
浏览文件 @ c8a7b02d
......@@ -14,8 +14,8 @@
</div>
</div>
<div style="margin:auto 10px;">
<table id="lingyongTable" lay-filter="lingyongTable"></table>
<script type="text/html" id="lingyongTableBar">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="messageTableBar">
{{# if(d.editRow == '1'){ }}
{{# if(auth('1596957208717')){ }}
<a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或