Browse Source

修改部分权限设置

lwx_dev
erdanergou 3 years ago
parent
commit
e41691af65
  1. 4
      src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml
  2. 63
      src/main/resources/templates/pages/group/group-out.html
  3. 2
      src/main/resources/templates/pages/group/group_edit.html
  4. 2
      src/main/resources/templates/pages/group/group_edit_mobile.html
  5. 58
      src/main/resources/templates/pages/material/material-out.html
  6. 198
      src/main/resources/templates/pages/materialtype/materialType_view.html
  7. 282
      src/main/resources/templates/pages/warehouse/depository-out.html
  8. 59
      src/main/resources/templates/pages/warehouse/warehouseByParentId.html
  9. 4
      target/classes/com/dreamchaser/depository_manage/mapper/GroupMapper.xml
  10. 63
      target/classes/templates/pages/group/group-out.html
  11. 2
      target/classes/templates/pages/group/group_edit.html
  12. 2
      target/classes/templates/pages/group/group_edit_mobile.html
  13. 58
      target/classes/templates/pages/material/material-out.html
  14. 198
      target/classes/templates/pages/materialtype/materialType_view.html
  15. 282
      target/classes/templates/pages/warehouse/depository-out.html
  16. 59
      target/classes/templates/pages/warehouse/warehouseByParentId.html

4
src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml

@ -362,8 +362,8 @@
</if>
<if test="gname != null and gname !=''">
gname = #{gname},
</if><if test="applyRemark != null and applyRemark !=''">
remark = #{applyRemark}
</if><if test="remark != null and remark !=''">
remark = #{remark}
</if>
</set>
where id = #{id}

63
src/main/resources/templates/pages/group/group-out.html

@ -89,7 +89,7 @@
<script type="text/html" id="currentTableBar">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" th:style="'display:'+${display}">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" id="display"
lay-event="realDelete">彻底删除</a>
</script>
<script type="text/html" id="currentTableBarForOut">
@ -152,8 +152,6 @@
{field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
{title: '出入库', minWidth: 200, toolbar: '#currentTableBarForOut', align: "center"},
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
]
],
limits: [10, 15, 20, 25, 50, 100],
@ -161,6 +159,7 @@
page: true,
skin: 'line',
done: function (res, curr, count) {
$.each(res['data'], function (i, j) {
let materialSimple = j["materialSimple"];
let gid = j["id"];
@ -392,34 +391,38 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
$.ajax({
url: "/group/changeGroupState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
table.reload('currentTableId', {
url: '/group/findAllGroup',
page: {
curr: 1
},
}, 'data');
}
let display = $("#display").css("display");
if(display !== "none"){
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
}
})
req["id"] = this.value;
$.ajax({
url: "/group/changeGroupState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
table.reload('currentTableId', {
url: '/group/findAllGroup',
page: {
curr: 1
},
}, 'data');
}
}
})
}
});

2
src/main/resources/templates/pages/group/group_edit.html

@ -325,7 +325,7 @@
let applyRemark = obj.value;
let req = {};
req.id = gid;
req.applyRemark = applyRemark;
req.remark = applyRemark;
$.ajax({
url:'/group/editGroupInfo',
dataType:"json",

2
src/main/resources/templates/pages/group/group_edit_mobile.html

@ -166,7 +166,7 @@
let applyRemark = obj.value;
let req = {};
req.id = gid;
req.applyRemark = applyRemark;
req.remark = applyRemark;
$.ajax({
url: '/group/editGroupInfo',
dataType: "json",

58
src/main/resources/templates/pages/material/material-out.html

@ -669,35 +669,39 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
let display = $("#display").val();
if(display !== "none"){
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
$.ajax({
url: "/material/material_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/material_out'
})
}
}
})
}
req["id"] = this.value;
$.ajax({
url: "/material/material_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/material_out'
})
}
}
})
});

198
src/main/resources/templates/pages/materialtype/materialType_view.html

@ -63,7 +63,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" id="display"
th:style="'display:'+${display}"> 添加
</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"
@ -592,27 +592,70 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1;
}
req["id"] = this.value;
var hasMaterial = false;
if (req["state"] === undefined) { //如果禁用
$.ajax({
url: "/materialType/findMaterialByMaterialTypeId", // 判断该类型下是否有物品
type: "post",
dataType: "json",
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (data) {
hasMaterial = data.data;
if (hasMaterial) { // 如果有物品
layer.confirm('该种类下还有物品,确定禁用?', {
btn: ['禁用', '取消'] //按钮
}, function () {
let display = $("#display").css("display");
if(display !== "none"){
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1;
}
req["id"] = this.value;
var hasMaterial = false;
if (req["state"] === undefined)
{ //如果禁用
$.ajax({
url: "/materialType/findMaterialByMaterialTypeId", // 判断该类型下是否有物品
type: "post",
dataType: "json",
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (data) {
hasMaterial = data.data;
if (hasMaterial) { // 如果有物品
layer.confirm('该种类下还有物品,确定禁用?', {
btn: ['禁用', '取消'] //按钮
}, function () {
$.ajax({
url: "/materialType/EditMaterialTypeState", // 禁用
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
}, function () {
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
});
} else { // 如果没有物品
$.ajax({
url: "/materialType/EditMaterialTypeState", // 禁用
url: "/materialType/EditMaterialTypeState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
@ -630,6 +673,7 @@
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行表格重加载
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
@ -637,89 +681,51 @@
},
where: {"parentId": parentId}
});
})
}
}
})
}, function () {
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
});
} else { // 如果没有物品
$.ajax({
url: "/materialType/EditMaterialTypeState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行表格重加载
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
}
}
}
})
} else { // 如果启用
$.ajax({
url: "/materialType/EditMaterialTypeState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行表格重加载
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
})
}
else { // 如果启用
$.ajax({
url: "/materialType/EditMaterialTypeState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行表格重加载
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
}
})
})
}
}
});
$('body').on('click', '[data-refresh]', function () {

282
src/main/resources/templates/pages/warehouse/depository-out.html

@ -76,8 +76,8 @@
<script id="toolbarDemo" type="text/html">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"> 删除</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" th:style="'display:'+${display}" id="display"> 添加</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" th:style="'display:'+${display}"> 删除</button>
</div>
</script>
@ -86,7 +86,7 @@
<script id="currentTableBar" type="text/html">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子仓</a>
<a class="layui-btn layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" lay-event="delete">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
lay-event="realDelete">彻底删除</a>
</script>
@ -460,109 +460,146 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
// 首先发送请求判断待禁用的仓库是否还有货物,如果没有就直接禁用,否则进行判断
var hasMaterial = false
var req = new Map
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
if (req["state"] === undefined) {// 如果禁用
$.ajax({
url: "/repository/findMaterialByDepository?depositoryId=" + this.value,
type: "get",
dataType: "json",
contentType: "application/json;charset=utf-8",
success: function (d) {
hasMaterial = d.data;
// 子仓库下是否有物品
if (hasMaterial) { // 有
let display = $("#display").css("display");
if(display !== "none"){
var hasMaterial = false;
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
if (req["state"] === undefined) {// 如果禁用
$.ajax({
url: "/repository/findMaterialByDepository?depositoryId=" + this.value,
type: "get",
dataType: "json",
contentType: "application/json;charset=utf-8",
success: function (d) {
hasMaterial = d.data;
// 子仓库下是否有物品
if (hasMaterial) { // 有
layer.confirm('仓库下还有物品,确定封库?', {
btn: ['封库', '取消'] //按钮
},
function () {
req["envelop"] = 1; // 封库操作
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.confirm('仓库下还有物品,确定封库?', {
btn: ['封库', '取消'] //按钮
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("封库成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
},
function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
function () {
req["envelop"] = 1; // 封库操作
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("封库成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
},
where: {"parentId": parentId}
});
});
}
else {
layer.confirm('确定封库?',{
btn:['确定','取消']
},
function () {
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
});
}
else {
layer.confirm('确定封库?',{
btn:['确定','取消']
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
},
function () {
function () {
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
},
function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
}
else { // 如果启用
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// window.location='/findWareHouseByParentId?parentId=0'+parentId
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
@ -572,45 +609,14 @@
where: {"parentId": parentId}
});
})
}
}
})
} else { // 如果启用
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// window.location='/findWareHouseByParentId?parentId=0'+parentId
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
}
})
})
}
}
});
showDetail = function (obj) {

59
src/main/resources/templates/pages/warehouse/warehouseByParentId.html

@ -21,6 +21,7 @@
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<input id="parentId" style="display: none" th:value="${parentId}">
<input id="display" style="display: none" th:value="${display}">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">库位行</label>
@ -336,36 +337,40 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
var req = {};
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
$.ajax({
url: "/place/editPlaceState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
let display = $("#display").val();
if(display !== "none"){
var req = {};
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
$.ajax({
url: "/place/editPlaceState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/warehouseByParentId?parentId=' + parentId;
})
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/warehouseByParentId?parentId=' + parentId;
})
}
}
}
})
})
}
});
viewInfoForInventory = function (obj) {

4
target/classes/com/dreamchaser/depository_manage/mapper/GroupMapper.xml

@ -362,8 +362,8 @@
</if>
<if test="gname != null and gname !=''">
gname = #{gname},
</if><if test="applyRemark != null and applyRemark !=''">
remark = #{applyRemark}
</if><if test="remark != null and remark !=''">
remark = #{remark}
</if>
</set>
where id = #{id}

63
target/classes/templates/pages/group/group-out.html

@ -89,7 +89,7 @@
<script type="text/html" id="currentTableBar">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" th:style="'display:'+${display}">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" id="display"
lay-event="realDelete">彻底删除</a>
</script>
<script type="text/html" id="currentTableBarForOut">
@ -152,8 +152,6 @@
{field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
{title: '出入库', minWidth: 200, toolbar: '#currentTableBarForOut', align: "center"},
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
]
],
limits: [10, 15, 20, 25, 50, 100],
@ -161,6 +159,7 @@
page: true,
skin: 'line',
done: function (res, curr, count) {
$.each(res['data'], function (i, j) {
let materialSimple = j["materialSimple"];
let gid = j["id"];
@ -392,34 +391,38 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
$.ajax({
url: "/group/changeGroupState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
table.reload('currentTableId', {
url: '/group/findAllGroup',
page: {
curr: 1
},
}, 'data');
}
let display = $("#display").css("display");
if(display !== "none"){
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
}
})
req["id"] = this.value;
$.ajax({
url: "/group/changeGroupState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
table.reload('currentTableId', {
url: '/group/findAllGroup',
page: {
curr: 1
},
}, 'data');
}
}
})
}
});

2
target/classes/templates/pages/group/group_edit.html

@ -325,7 +325,7 @@
let applyRemark = obj.value;
let req = {};
req.id = gid;
req.applyRemark = applyRemark;
req.remark = applyRemark;
$.ajax({
url:'/group/editGroupInfo',
dataType:"json",

2
target/classes/templates/pages/group/group_edit_mobile.html

@ -166,7 +166,7 @@
let applyRemark = obj.value;
let req = {};
req.id = gid;
req.applyRemark = applyRemark;
req.remark = applyRemark;
$.ajax({
url: '/group/editGroupInfo',
dataType: "json",

58
target/classes/templates/pages/material/material-out.html

@ -669,35 +669,39 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
let display = $("#display").val();
if(display !== "none"){
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
$.ajax({
url: "/material/material_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/material_out'
})
}
}
})
}
req["id"] = this.value;
$.ajax({
url: "/material/material_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/material_out'
})
}
}
})
});

198
target/classes/templates/pages/materialtype/materialType_view.html

@ -63,7 +63,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" id="display"
th:style="'display:'+${display}"> 添加
</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"
@ -592,27 +592,70 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1;
}
req["id"] = this.value;
var hasMaterial = false;
if (req["state"] === undefined) { //如果禁用
$.ajax({
url: "/materialType/findMaterialByMaterialTypeId", // 判断该类型下是否有物品
type: "post",
dataType: "json",
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (data) {
hasMaterial = data.data;
if (hasMaterial) { // 如果有物品
layer.confirm('该种类下还有物品,确定禁用?', {
btn: ['禁用', '取消'] //按钮
}, function () {
let display = $("#display").css("display");
if(display !== "none"){
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1;
}
req["id"] = this.value;
var hasMaterial = false;
if (req["state"] === undefined)
{ //如果禁用
$.ajax({
url: "/materialType/findMaterialByMaterialTypeId", // 判断该类型下是否有物品
type: "post",
dataType: "json",
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (data) {
hasMaterial = data.data;
if (hasMaterial) { // 如果有物品
layer.confirm('该种类下还有物品,确定禁用?', {
btn: ['禁用', '取消'] //按钮
}, function () {
$.ajax({
url: "/materialType/EditMaterialTypeState", // 禁用
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
}, function () {
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
});
} else { // 如果没有物品
$.ajax({
url: "/materialType/EditMaterialTypeState", // 禁用
url: "/materialType/EditMaterialTypeState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
@ -630,6 +673,7 @@
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行表格重加载
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
@ -637,89 +681,51 @@
},
where: {"parentId": parentId}
});
})
}
}
})
}, function () {
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
});
} else { // 如果没有物品
$.ajax({
url: "/materialType/EditMaterialTypeState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行表格重加载
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
}
}
}
})
} else { // 如果启用
$.ajax({
url: "/materialType/EditMaterialTypeState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行表格重加载
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
})
}
else { // 如果启用
$.ajax({
url: "/materialType/EditMaterialTypeState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行表格重加载
table.reload('currentTableId', {
url: '/materialType/materialTypeRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
}
})
})
}
}
});
$('body').on('click', '[data-refresh]', function () {

282
target/classes/templates/pages/warehouse/depository-out.html

@ -76,8 +76,8 @@
<script id="toolbarDemo" type="text/html">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"> 删除</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" th:style="'display:'+${display}" id="display"> 添加</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" th:style="'display:'+${display}"> 删除</button>
</div>
</script>
@ -86,7 +86,7 @@
<script id="currentTableBar" type="text/html">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子仓</a>
<a class="layui-btn layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" lay-event="delete">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
lay-event="realDelete">彻底删除</a>
</script>
@ -460,109 +460,146 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
// 首先发送请求判断待禁用的仓库是否还有货物,如果没有就直接禁用,否则进行判断
var hasMaterial = false
var req = new Map
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
if (req["state"] === undefined) {// 如果禁用
$.ajax({
url: "/repository/findMaterialByDepository?depositoryId=" + this.value,
type: "get",
dataType: "json",
contentType: "application/json;charset=utf-8",
success: function (d) {
hasMaterial = d.data;
// 子仓库下是否有物品
if (hasMaterial) { // 有
let display = $("#display").css("display");
if(display !== "none"){
var hasMaterial = false;
var req = new Map;
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
if (req["state"] === undefined) {// 如果禁用
$.ajax({
url: "/repository/findMaterialByDepository?depositoryId=" + this.value,
type: "get",
dataType: "json",
contentType: "application/json;charset=utf-8",
success: function (d) {
hasMaterial = d.data;
// 子仓库下是否有物品
if (hasMaterial) { // 有
layer.confirm('仓库下还有物品,确定封库?', {
btn: ['封库', '取消'] //按钮
},
function () {
req["envelop"] = 1; // 封库操作
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.confirm('仓库下还有物品,确定封库?', {
btn: ['封库', '取消'] //按钮
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("封库成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
},
function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
function () {
req["envelop"] = 1; // 封库操作
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("封库成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
},
where: {"parentId": parentId}
});
});
}
else {
layer.confirm('确定封库?',{
btn:['确定','取消']
},
function () {
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
});
}
else {
layer.confirm('确定封库?',{
btn:['确定','取消']
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
},
function () {
function () {
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
},
function () {
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
})
}
else { // 如果启用
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// window.location='/findWareHouseByParentId?parentId=0'+parentId
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
@ -572,45 +609,14 @@
where: {"parentId": parentId}
});
})
}
}
})
} else { // 如果启用
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
// window.location='/findWareHouseByParentId?parentId=0'+parentId
// 执行重加载
table.reload('currentTableId', {
url: '/repository/warehouseRecord',
page: {
curr: 1
},
where: {"parentId": parentId}
});
})
}
}
}
})
})
}
}
});
showDetail = function (obj) {

59
target/classes/templates/pages/warehouse/warehouseByParentId.html

@ -21,6 +21,7 @@
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<input id="parentId" style="display: none" th:value="${parentId}">
<input id="display" style="display: none" th:value="${display}">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">库位行</label>
@ -336,36 +337,40 @@
//监听状态操作
form.on('switch(changeState)', function (obj) {
var req = {};
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
$.ajax({
url: "/place/editPlaceState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
let display = $("#display").val();
if(display !== "none"){
var req = {};
if (obj.elem.checked) {
req["state"] = 1
}
req["id"] = this.value;
$.ajax({
url: "/place/editPlaceState",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/warehouseByParentId?parentId=' + parentId;
})
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/warehouseByParentId?parentId=' + parentId;
})
}
}
}
})
})
}
});
viewInfoForInventory = function (obj) {

Loading…
Cancel
Save