pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改我的任务、我的申请页面

lwx_dev
erdanergou 2 years ago
parent
32a1f65518
commit
4a88b2ad25
4 changed files with 996 additions and 698 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 111
      src/main/resources/templates/pages/application/my-apply.html
  2. 94
      src/main/resources/templates/pages/application/my-task.html
  3. 111
      target/classes/templates/pages/application/my-apply.html
  4. 94
      target/classes/templates/pages/application/my-task.html

111
src/main/resources/templates/pages/application/my-apply.html
View File

@ -25,13 +25,13 @@
*zoom: 1; *zoom: 1;
} }
</style> </style>
<div class="layui-tab layui-tab-card"> <div class="layui-tab layui-tab-card" lay-filter="myApplyTab">
<ul class="layui-tab-title" > <ul class="layui-tab-title" >
<li class="layui-this">入库记录</li> <li class="layui-this" lay-id="applicationIn">入库记录</li>
<li>出库申请</li> <li lay-id="applicationOut">出库申请</li>
<li>盘点申请</li> <li lay-id="stockTaking">盘点申请</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
@ -53,22 +53,55 @@
//先声明 //先声明
function openDetailIn(data) { function openDetailIn(data) {
}; }
function openDetailOut(data) { function openDetailOut(data) {
}; }
function openDetailTaking(data){ function openDetailTaking(data){
}; }
layui.use(['flow', 'layer', 'util'], function () {
function initApplicationIn(){
}
function initApplicationOut() {
}
function initStockTaking(){
}
layui.use(['flow', 'layer', 'util','element'], function () {
var $ = layui.jquery, var $ = layui.jquery,
layer = layui.layer, layer = layui.layer,
flow = layui.flow, flow = layui.flow,
element = layui.element,
util = layui.util; util = layui.util;
let size = 8; let size = 8;
let inpre = 0; let inpre = 0;
let takingPre = 0; let takingPre = 0;
let outpre = 0; let outpre = 0;
$(function() {
initApplicationIn();
});
// 切换事件(绑定未完成任务的选项卡)
element.on('tab(myApplyTab)', function(obj){
let layId = $(obj.elem.context).attr("lay-id");
if(layId.includes("applicationIn")){
initApplicationIn();
}else if (layId.includes("applicationOut")){
initApplicationOut();
}else if(layId.includes("stockTaking")){
initStockTaking();
}
});
initStockTaking =function() {
flow.load({ flow.load({
elem: '#LAY_floor_stockTaking' //流加载容器 elem: '#LAY_floor_stockTaking' //流加载容器
, scrollElem: '#LAY_floor_stockTaking' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor_stockTaking' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -99,7 +132,9 @@
}); });
} }
}); });
};
initApplicationIn = function() {
flow.load({ flow.load({
elem: '#LAY_floor_in' //流加载容器 elem: '#LAY_floor_in' //流加载容器
, scrollElem: '#LAY_floor_in' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor_in' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -133,6 +168,10 @@
} }
}); });
};
initApplicationOut = function() {
flow.load({ flow.load({
elem: '#LAY_floor_out' //流加载容器 elem: '#LAY_floor_out' //流加载容器
, scrollElem: '#LAY_floor_out' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor_out' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -167,7 +206,13 @@
}); });
} }
}); });
};
openDetailIn = function (item) { openDetailIn = function (item) {
if(isMobile()){
var index = layer.open({ var index = layer.open({
title: '请求详情', title: '请求详情',
type: 2, type: 2,
@ -180,8 +225,23 @@
$(window).on("resize", function () { $(window).on("resize", function () {
layer.full(index); layer.full(index);
}); });
}else{
layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
offset: 'r',
anim: 'slideLeft', // 从右往左
shadeClose: true,
area: ['30%', '100%'],
content: '/form_step_look?id=' + item,
});
}
}; };
openDetailOut = function (item) { openDetailOut = function (item) {
if(isMobile()){
var index = layer.open({ var index = layer.open({
title: '请求详情', title: '请求详情',
type: 2, type: 2,
@ -194,8 +254,23 @@
$(window).on("resize", function () { $(window).on("resize", function () {
layer.full(index); layer.full(index);
}); });
}else{
index = layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
offset: 'r',
anim: 'slideLeft', // 从右往左
maxmin: true,
shadeClose: true,
area: ['40%', '100%'],
content: '/ApplicationOutView?id=' + item,
});
}
}; };
openDetailTaking = function (data) { openDetailTaking = function (data) {
if(isMobile()){
var index = layer.open({ var index = layer.open({
title: '请求详情', title: '请求详情',
type: 2, type: 2,
@ -211,6 +286,23 @@
$(window).on("resize", function () { $(window).on("resize", function () {
layer.full(index); layer.full(index);
}); });
}else{
layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
offset: 'r',
anim: 'slideLeft', // 从右往左
area: ['30%', '100%'],
content: '/StockTakingView?id='+data,
end:function () {
location.reload()
}
});
}
}; };
//定义一个函数判断是手机端还是pc端 //定义一个函数判断是手机端还是pc端
@ -222,9 +314,6 @@
} }
} }
$('body').on('click', '[data-refresh]', function () {
location.reload();
})
}); });
</script> </script>
</body> </body>

94
src/main/resources/templates/pages/application/my-task.html
View File

@ -30,17 +30,17 @@
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<div class="layui-tab"> <div class="layui-tab" lay-filter="firstTab">
<ul class="layui-tab-title"> <ul class="layui-tab-title">
<li class="layui-this">未完成任务</li> <li class="layui-this" lay-id="incomplete">未完成任务</li>
<li >已完成任务</li> <li lay-id="complete">已完成任务</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
<div class="layui-tab layui-tab-card"> <div class="layui-tab layui-tab-card" lay-filter="incompleteTab">
<ul class="layui-tab-title" > <ul class="layui-tab-title" >
<li class="layui-this">审核任务</li> <li class="layui-this" lay-id="incompleteApproval">审核任务</li>
<li>出库任务</li> <li lay-id="incompleteOut">出库任务</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
@ -53,9 +53,9 @@
</div> </div>
</div> </div>
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-tab layui-tab-card"> <div class="layui-tab layui-tab-card" lay-filter="completeTab">
<ul class="layui-tab-title"> <ul class="layui-tab-title">
<li class="layui-this">审核任务</li> <li lay-id="completeApproval" class="layui-this">审核任务</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
@ -115,16 +115,58 @@
} }
layui.use(['flow', 'layer', 'table', 'util'], function () { // 初始化未完成的审核任务
function initIncompleteReview(){
}
// 初始化已完成的审核任务
function initCompleteReview() {
}
// 初始化未完成的出库任务
function initIncompleteOutTask() {
}
layui.use(['flow', 'layer', 'table', 'util', 'element'], function () {
var $ = layui.jquery, var $ = layui.jquery,
layer = layui.layer, layer = layui.layer,
flow = layui.flow, flow = layui.flow,
table = layui.table, table = layui.table,
element = layui.element,
util = layui.util; util = layui.util;
//每页的数量 //每页的数量
var size = 8; var size = 8;
let pre1 = 0, pre2 = 0, pre3 = 0, pre4 = 0, pre5 = 0, pre6 = 0; let pre1 = 0, pre2 = 0, pre3 = 0, pre4 = 0, pre5 = 0, pre6 = 0;
$(function() {
initIncompleteReview();
});
// 切换事件(绑定未完成任务的选项卡)
element.on('tab(incompleteTab)', function(obj){
let layId = $(obj.elem.context).attr("lay-id");
if(layId.includes("Approval")){
initIncompleteReview();
}else if (layId.includes("Out")){
initIncompleteOutTask();
}
});
// 切换事件(绑定已完成任务的选项卡)
element.on('tab(firstTab)', function(obj){
let layId = $(obj.elem.context).attr("lay-id");
if(layId.includes("incomplete")){
initIncompleteReview();
}else{
initCompleteReview();
}
});
// 未完成任务-审核任务 // 未完成任务-审核任务
initIncompleteReview = function(){
flow.load({ flow.load({
elem: '#LAY_floor1' //流加载容器 elem: '#LAY_floor1' //流加载容器
, scrollElem: '#LAY_floor1' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor1' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -200,7 +242,10 @@
} }
}); });
};
// 已完成任务-审核任务 // 已完成任务-审核任务
initCompleteReview = function() {
flow.load({ flow.load({
elem: '#LAY_floor2' //流加载容器 elem: '#LAY_floor2' //流加载容器
, scrollElem: '#LAY_floor2' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor2' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -275,7 +320,10 @@
}); });
} }
}); });
};
// 未完成任务-出库任务 // 未完成任务-出库任务
initIncompleteOutTask = function() {
flow.load({ flow.load({
elem: '#LAY_floor3' //流加载容器 elem: '#LAY_floor3' //流加载容器
, scrollElem: '#LAY_floor3' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor3' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -314,11 +362,14 @@
}); });
} }
}); });
};
// 用于跳转到出库审核页面 // 用于跳转到出库审核页面
openDetailForOut = function (item) { openDetailForOut = function (item) {
var index = layer.open({ if(isMobile()){
layer.open({
title: '请求详情', title: '请求详情',
type: 2, type: 2,
shade: 0.2, shade: 0.2,
@ -330,10 +381,22 @@
location.reload() location.reload()
} }
}); });
}else{
$(window).on("resize", function () { layer.open({
layer.full(index); title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
offset: 'r',
anim: 'slideLeft', // 从右往左
shadeClose: true,
area: ['30%', '100%'],
content: '/application_review?id=' + item,
end: function () {
flow.reload()
}
}); });
}
}; };
// 用于跳转到入库审核页面 // 用于跳转到入库审核页面
openDetailForIn = function (item) { openDetailForIn = function (item) {
@ -343,6 +406,7 @@
shade: 0.2, shade: 0.2,
maxmin: true, maxmin: true,
shadeClose: true, shadeClose: true,
area: ['100%', '100%'], area: ['100%', '100%'],
content: '/application_in_review?id=' + item, content: '/application_in_review?id=' + item,
end: function () { end: function () {
@ -516,10 +580,6 @@
return false; // PC端 return false; // PC端
} }
} }
$('body').on('click', '[data-refresh]', function () {
location.reload();
})
}); });
</script> </script>
</html> </html>

111
target/classes/templates/pages/application/my-apply.html
View File

@ -25,13 +25,13 @@
*zoom: 1; *zoom: 1;
} }
</style> </style>
<div class="layui-tab layui-tab-card"> <div class="layui-tab layui-tab-card" lay-filter="myApplyTab">
<ul class="layui-tab-title" > <ul class="layui-tab-title" >
<li class="layui-this">入库记录</li> <li class="layui-this" lay-id="applicationIn">入库记录</li>
<li>出库申请</li> <li lay-id="applicationOut">出库申请</li>
<li>盘点申请</li> <li lay-id="stockTaking">盘点申请</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
@ -53,22 +53,55 @@
//先声明 //先声明
function openDetailIn(data) { function openDetailIn(data) {
}; }
function openDetailOut(data) { function openDetailOut(data) {
}; }
function openDetailTaking(data){ function openDetailTaking(data){
}; }
layui.use(['flow', 'layer', 'util'], function () {
function initApplicationIn(){
}
function initApplicationOut() {
}
function initStockTaking(){
}
layui.use(['flow', 'layer', 'util','element'], function () {
var $ = layui.jquery, var $ = layui.jquery,
layer = layui.layer, layer = layui.layer,
flow = layui.flow, flow = layui.flow,
element = layui.element,
util = layui.util; util = layui.util;
let size = 8; let size = 8;
let inpre = 0; let inpre = 0;
let takingPre = 0; let takingPre = 0;
let outpre = 0; let outpre = 0;
$(function() {
initApplicationIn();
});
// 切换事件(绑定未完成任务的选项卡)
element.on('tab(myApplyTab)', function(obj){
let layId = $(obj.elem.context).attr("lay-id");
if(layId.includes("applicationIn")){
initApplicationIn();
}else if (layId.includes("applicationOut")){
initApplicationOut();
}else if(layId.includes("stockTaking")){
initStockTaking();
}
});
initStockTaking =function() {
flow.load({ flow.load({
elem: '#LAY_floor_stockTaking' //流加载容器 elem: '#LAY_floor_stockTaking' //流加载容器
, scrollElem: '#LAY_floor_stockTaking' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor_stockTaking' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -99,7 +132,9 @@
}); });
} }
}); });
};
initApplicationIn = function() {
flow.load({ flow.load({
elem: '#LAY_floor_in' //流加载容器 elem: '#LAY_floor_in' //流加载容器
, scrollElem: '#LAY_floor_in' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor_in' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -133,6 +168,10 @@
} }
}); });
};
initApplicationOut = function() {
flow.load({ flow.load({
elem: '#LAY_floor_out' //流加载容器 elem: '#LAY_floor_out' //流加载容器
, scrollElem: '#LAY_floor_out' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor_out' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -167,7 +206,13 @@
}); });
} }
}); });
};
openDetailIn = function (item) { openDetailIn = function (item) {
if(isMobile()){
var index = layer.open({ var index = layer.open({
title: '请求详情', title: '请求详情',
type: 2, type: 2,
@ -180,8 +225,23 @@
$(window).on("resize", function () { $(window).on("resize", function () {
layer.full(index); layer.full(index);
}); });
}else{
layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
offset: 'r',
anim: 'slideLeft', // 从右往左
shadeClose: true,
area: ['30%', '100%'],
content: '/form_step_look?id=' + item,
});
}
}; };
openDetailOut = function (item) { openDetailOut = function (item) {
if(isMobile()){
var index = layer.open({ var index = layer.open({
title: '请求详情', title: '请求详情',
type: 2, type: 2,
@ -194,8 +254,23 @@
$(window).on("resize", function () { $(window).on("resize", function () {
layer.full(index); layer.full(index);
}); });
}else{
index = layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
offset: 'r',
anim: 'slideLeft', // 从右往左
maxmin: true,
shadeClose: true,
area: ['40%', '100%'],
content: '/ApplicationOutView?id=' + item,
});
}
}; };
openDetailTaking = function (data) { openDetailTaking = function (data) {
if(isMobile()){
var index = layer.open({ var index = layer.open({
title: '请求详情', title: '请求详情',
type: 2, type: 2,
@ -211,6 +286,23 @@
$(window).on("resize", function () { $(window).on("resize", function () {
layer.full(index); layer.full(index);
}); });
}else{
layer.open({
title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
offset: 'r',
anim: 'slideLeft', // 从右往左
area: ['30%', '100%'],
content: '/StockTakingView?id='+data,
end:function () {
location.reload()
}
});
}
}; };
//定义一个函数判断是手机端还是pc端 //定义一个函数判断是手机端还是pc端
@ -222,9 +314,6 @@
} }
} }
$('body').on('click', '[data-refresh]', function () {
location.reload();
})
}); });
</script> </script>
</body> </body>

94
target/classes/templates/pages/application/my-task.html
View File

@ -30,17 +30,17 @@
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<div class="layui-tab"> <div class="layui-tab" lay-filter="firstTab">
<ul class="layui-tab-title"> <ul class="layui-tab-title">
<li class="layui-this">未完成任务</li> <li class="layui-this" lay-id="incomplete">未完成任务</li>
<li >已完成任务</li> <li lay-id="complete">已完成任务</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
<div class="layui-tab layui-tab-card"> <div class="layui-tab layui-tab-card" lay-filter="incompleteTab">
<ul class="layui-tab-title" > <ul class="layui-tab-title" >
<li class="layui-this">审核任务</li> <li class="layui-this" lay-id="incompleteApproval">审核任务</li>
<li>出库任务</li> <li lay-id="incompleteOut">出库任务</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
@ -53,9 +53,9 @@
</div> </div>
</div> </div>
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-tab layui-tab-card"> <div class="layui-tab layui-tab-card" lay-filter="completeTab">
<ul class="layui-tab-title"> <ul class="layui-tab-title">
<li class="layui-this">审核任务</li> <li lay-id="completeApproval" class="layui-this">审核任务</li>
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<div class="layui-tab-item layui-show"> <div class="layui-tab-item layui-show">
@ -115,16 +115,58 @@
} }
layui.use(['flow', 'layer', 'table', 'util'], function () { // 初始化未完成的审核任务
function initIncompleteReview(){
}
// 初始化已完成的审核任务
function initCompleteReview() {
}
// 初始化未完成的出库任务
function initIncompleteOutTask() {
}
layui.use(['flow', 'layer', 'table', 'util', 'element'], function () {
var $ = layui.jquery, var $ = layui.jquery,
layer = layui.layer, layer = layui.layer,
flow = layui.flow, flow = layui.flow,
table = layui.table, table = layui.table,
element = layui.element,
util = layui.util; util = layui.util;
//每页的数量 //每页的数量
var size = 8; var size = 8;
let pre1 = 0, pre2 = 0, pre3 = 0, pre4 = 0, pre5 = 0, pre6 = 0; let pre1 = 0, pre2 = 0, pre3 = 0, pre4 = 0, pre5 = 0, pre6 = 0;
$(function() {
initIncompleteReview();
});
// 切换事件(绑定未完成任务的选项卡)
element.on('tab(incompleteTab)', function(obj){
let layId = $(obj.elem.context).attr("lay-id");
if(layId.includes("Approval")){
initIncompleteReview();
}else if (layId.includes("Out")){
initIncompleteOutTask();
}
});
// 切换事件(绑定已完成任务的选项卡)
element.on('tab(firstTab)', function(obj){
let layId = $(obj.elem.context).attr("lay-id");
if(layId.includes("incomplete")){
initIncompleteReview();
}else{
initCompleteReview();
}
});
// 未完成任务-审核任务 // 未完成任务-审核任务
initIncompleteReview = function(){
flow.load({ flow.load({
elem: '#LAY_floor1' //流加载容器 elem: '#LAY_floor1' //流加载容器
, scrollElem: '#LAY_floor1' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor1' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -200,7 +242,10 @@
} }
}); });
};
// 已完成任务-审核任务 // 已完成任务-审核任务
initCompleteReview = function() {
flow.load({ flow.load({
elem: '#LAY_floor2' //流加载容器 elem: '#LAY_floor2' //流加载容器
, scrollElem: '#LAY_floor2' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor2' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -275,7 +320,10 @@
}); });
} }
}); });
};
// 未完成任务-出库任务 // 未完成任务-出库任务
initIncompleteOutTask = function() {
flow.load({ flow.load({
elem: '#LAY_floor3' //流加载容器 elem: '#LAY_floor3' //流加载容器
, scrollElem: '#LAY_floor3' //滚动条所在元素，一般不用填，此处只是演示需要。 , scrollElem: '#LAY_floor3' //滚动条所在元素，一般不用填，此处只是演示需要。
@ -314,11 +362,14 @@
}); });
} }
}); });
};
// 用于跳转到出库审核页面 // 用于跳转到出库审核页面
openDetailForOut = function (item) { openDetailForOut = function (item) {
var index = layer.open({ if(isMobile()){
layer.open({
title: '请求详情', title: '请求详情',
type: 2, type: 2,
shade: 0.2, shade: 0.2,
@ -330,10 +381,22 @@
location.reload() location.reload()
} }
}); });
}else{
$(window).on("resize", function () { layer.open({
layer.full(index); title: '请求详情',
type: 2,
shade: 0.2,
maxmin: true,
offset: 'r',
anim: 'slideLeft', // 从右往左
shadeClose: true,
area: ['30%', '100%'],
content: '/application_review?id=' + item,
end: function () {
flow.reload()
}
}); });
}
}; };
// 用于跳转到入库审核页面 // 用于跳转到入库审核页面
openDetailForIn = function (item) { openDetailForIn = function (item) {
@ -343,6 +406,7 @@
shade: 0.2, shade: 0.2,
maxmin: true, maxmin: true,
shadeClose: true, shadeClose: true,
area: ['100%', '100%'], area: ['100%', '100%'],
content: '/application_in_review?id=' + item, content: '/application_in_review?id=' + item,
end: function () { end: function () {
@ -516,10 +580,6 @@
return false; // PC端 return false; // PC端
} }
} }
$('body').on('click', '[data-refresh]', function () {
location.reload();
})
}); });
</script> </script>
</html> </html>
Write Preview
Loading…
Cancel
Save