机具领料逻辑修改
This commit is contained in:
parent
06b37f0185
commit
6ff779ea85
|
|
@ -2,6 +2,7 @@ var taskId;
|
||||||
var applyTime;
|
var applyTime;
|
||||||
var today;
|
var today;
|
||||||
var applyDate;
|
var applyDate;
|
||||||
|
var currentResults = []; // 用于保存当前页面的领料明细数据
|
||||||
|
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
|
|
@ -18,12 +19,22 @@ $(function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#addBtn').on('click',function(e) {
|
$('#addBtn').on('click',function(e) {
|
||||||
if (applyDate !== today) {
|
/* if (applyDate !== today) {
|
||||||
layer.alert('领料时间不是今天,不允许进行新增操作', {
|
layer.alert('领料时间不是今天,不允许进行新增操作', {
|
||||||
skin: 'layui-layer-molv', // 样式类名
|
skin: 'layui-layer-molv', // 样式类名
|
||||||
closeBtn: 0
|
closeBtn: 0
|
||||||
});
|
});
|
||||||
return; // 退出函数,阻止新增操作
|
return; // 退出函数,阻止新增操作
|
||||||
|
}*/
|
||||||
|
var hasConfirmed = currentResults.some(function(item) {
|
||||||
|
return item.isSure == 1 || item.isSure == "1";
|
||||||
|
});
|
||||||
|
if (hasConfirmed) {
|
||||||
|
layer.alert('存在已确认的领料记录,不允许新增!', {
|
||||||
|
skin: 'layui-layer-molv',
|
||||||
|
closeBtn: 0
|
||||||
|
});
|
||||||
|
return; // 阻止新增
|
||||||
}
|
}
|
||||||
$("#maTypeName").attr("readOnly",false);
|
$("#maTypeName").attr("readOnly",false);
|
||||||
$("#maModelName").attr("readOnly",false);
|
$("#maModelName").attr("readOnly",false);
|
||||||
|
|
@ -209,6 +220,7 @@ function getbaseList(init) {
|
||||||
var list = obj.list;
|
var list = obj.list;
|
||||||
var results = list.results;
|
var results = list.results;
|
||||||
var permitBtn = obj.permitBtn;
|
var permitBtn = obj.permitBtn;
|
||||||
|
currentResults = results || []; // 更新全局变量
|
||||||
var pageNum = list.pageNum, pageSize = list.pageSize, totalRecord = list.totalRecord;
|
var pageNum = list.pageNum, pageSize = list.pageSize, totalRecord = list.totalRecord;
|
||||||
var html = "";
|
var html = "";
|
||||||
if (results != null && results.length > 0) {
|
if (results != null && results.length > 0) {
|
||||||
|
|
@ -337,12 +349,25 @@ function check(taskId,maModelId,preCollerNum,checkerId) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
function del(taskId,maModelId) {
|
function del(taskId,maModelId) {
|
||||||
if (applyDate !== today) {
|
/*if (applyDate !== today) {
|
||||||
layer.alert('领料时间不是今天,不允许进行删除操作', {
|
layer.alert('领料时间不是今天,不允许进行删除操作', {
|
||||||
skin: 'layui-layer-molv', // 样式类名
|
skin: 'layui-layer-molv', // 样式类名
|
||||||
closeBtn: 0
|
closeBtn: 0
|
||||||
});
|
});
|
||||||
return; // 退出函数
|
return; // 退出函数
|
||||||
|
}*/
|
||||||
|
// 从 currentResults 中查找对应的记录
|
||||||
|
var record = currentResults.find(function(item) {
|
||||||
|
return item.taskId == taskId && item.maModelId == maModelId;
|
||||||
|
});
|
||||||
|
|
||||||
|
// 判断是否已确认
|
||||||
|
if (record && (record.isSure == 1 || record.isSure == "1")) {
|
||||||
|
layer.alert('已确认的记录不允许删除!', {
|
||||||
|
skin: 'layui-layer-molv',
|
||||||
|
closeBtn: 0
|
||||||
|
});
|
||||||
|
return; // 阻止删除
|
||||||
}
|
}
|
||||||
JY.Model.confirm("确认删除吗?", function() {
|
JY.Model.confirm("确认删除吗?", function() {
|
||||||
JY.Ajax.doRequest(null, bonuspath + '/backstage/receiveDetails/del', {
|
JY.Ajax.doRequest(null, bonuspath + '/backstage/receiveDetails/del', {
|
||||||
|
|
@ -392,13 +417,13 @@ function search() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function edit(taskId,maModelId) {
|
function edit(taskId,maModelId) {
|
||||||
if (applyDate !== today) {
|
/* if (applyDate !== today) {
|
||||||
layer.alert('领料时间不是今天,不允许进行修改操作', {
|
layer.alert('领料时间不是今天,不允许进行修改操作', {
|
||||||
skin: 'layui-layer-molv', // 样式类名
|
skin: 'layui-layer-molv', // 样式类名
|
||||||
closeBtn: 0
|
closeBtn: 0
|
||||||
});
|
});
|
||||||
return; // 退出函数
|
return; // 退出函数
|
||||||
}
|
}*/
|
||||||
$("#maTypeName").attr("readOnly",true);
|
$("#maTypeName").attr("readOnly",true);
|
||||||
$("#maModelName").attr("readOnly",true);
|
$("#maModelName").attr("readOnly",true);
|
||||||
$(".maTree").css("display","none");
|
$(".maTree").css("display","none");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue