机具领料逻辑修改

WebContent/static/js/lease/receiveDetails.js

@@ -2,6 +2,7 @@ var taskId;
 var applyTime;
 var today;
 var applyDate;
+var currentResults = []; // 用于保存当前页面的领料明细数据
 
 
 $(function() {
@@ -16,14 +17,24 @@ $(function() {
 			search();
 		}
 	});
-	
+
 	$('#addBtn').on('click',function(e) {
-		if (applyDate !== today) {
+	/*	if (applyDate !== today) {
 			layer.alert('领料时间不是今天，不允许进行新增操作', {
 				skin: 'layui-layer-molv', // 样式类名
 				closeBtn: 0
 			});
 			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);
 		$("#maModelName").attr("readOnly",false);
@@ -51,7 +62,7 @@ $(function() {
 							  closeBtn: 0
 						});
 					}else{
-						JY.Ajax.doRequest(null, bonuspath+'/backstage/receiveDetails/add', 
+						JY.Ajax.doRequest(null, bonuspath+'/backstage/receiveDetails/add',
 								{
 							taskId:taskId,
 							leasePlanOutId:leasePlanOutId,
@@ -59,7 +70,7 @@ $(function() {
 							machinesNum:machineNum,
 							customerSrep:serviceId,
 							checker:checkId
-							}, 
+							},
 							function(data) {
 						JY.Model.info(data.resMsg, function() {
 							that.dialog("close");
@@ -209,6 +220,7 @@ function getbaseList(init) {
 		var list = obj.list;
 		var results = list.results;
 		var permitBtn = obj.permitBtn;
+		currentResults = results || []; // 更新全局变量
 		var pageNum = list.pageNum, pageSize = list.pageSize, totalRecord = list.totalRecord;
 		var html = "";
 		if (results != null && results.length > 0) {
@@ -241,10 +253,10 @@ function getbaseList(init) {
 				}else if(l.isExamine==1 || l.isExamine=='1'){
 					html += "<td style='vertical-align:middle;' class='center'><span style='clolr:green;'>已通过</span></td>";
 				}else{
-					
+
 					html += "<td style='vertical-align:middle;' class='center'> <a href='#' onclick='viewAudit(&apos;" + l.auditRemark + "&apos; )'><span style='clolr:red;'>未通过</span></a></td>";
 				}*/
-				
+
 				if( l.isApproval == 0 || l.isApproval == '0'){
 					html += "<td style='vertical-align:middle;' class='center'><span style='color: red'>未批准</span></td>";
 				}else if(l.isApproval == 1 || l.isApproval == '1'){
@@ -252,7 +264,7 @@ function getbaseList(init) {
 				}else{
 					html += "<td style='vertical-align:middle;' class='center'> <a href='#' onclick='viewApproval( &apos;" + l.approvalRemark + "&apos;)'><span style='clolr:red;'>未通过</span></a></td>";
 				}
-				
+
 				//原检验人员Id改为客服代表Id
 				html += rowFunction(l.taskId,l.maModelId,l.isSure,l.customerSrepId,l.preCollerNum);
 				html += "</tr>";
@@ -306,7 +318,7 @@ function viewAudit(auditRemark){
 }
 
 function viewApproval(approvalRemark){
-	
+
 	$("#remarkForm input[name$='remarks']").val(approvalRemark);
 	JY.Model.check("remarkDiv");
 }
@@ -337,15 +349,28 @@ function check(taskId,maModelId,preCollerNum,checkerId) {
 	});
 }
 function del(taskId,maModelId) {
-	if (applyDate !== today) {
+	/*if (applyDate !== today) {
 		layer.alert('领料时间不是今天，不允许进行删除操作', {
 			skin: 'layui-layer-molv', // 样式类名
 			closeBtn: 0
 		});
 		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.Ajax.doRequest(null, bonuspath + '/backstage/receiveDetails/del', {   
+		JY.Ajax.doRequest(null, bonuspath + '/backstage/receiveDetails/del', {
 			taskId : taskId,
 			maModelId: maModelId
 		}, function(data) {
@@ -392,13 +417,13 @@ function search() {
 }
 
 function edit(taskId,maModelId) {
-	if (applyDate !== today) {
+/*	if (applyDate !== today) {
 		layer.alert('领料时间不是今天，不允许进行修改操作', {
 			skin: 'layui-layer-molv', // 样式类名
 			closeBtn: 0
 		});
 		return; // 退出函数
-	}
+	}*/
 	$("#maTypeName").attr("readOnly",true);
 	$("#maModelName").attr("readOnly",true);
 	$(".maTree").css("display","none");
@@ -426,7 +451,7 @@ function edit(taskId,maModelId) {
 						});
 					}else{								//machinesType原来的ID machinesModel修改后的ID
 						JY.Ajax.doRequest(null, bonuspath+'/backstage/receiveDetails/update',
-								{taskId:taskId, maModelId:maModelId, machinesNum:machineNums,serviceId:serviceId}, 
+								{taskId:taskId, maModelId:maModelId, machinesNum:machineNums,serviceId:serviceId},
 								function(data) {
 							JY.Model.info(data.obj, function() {
 								that.dialog("close");
@@ -444,7 +469,7 @@ function setDetaFrom(data){
 	var l = data.obj[0];
 	console.info(JSON.stringify(data))
 	console.info(l.maType)
-	
+
 	$("#maTypeName").val(l.maType);//机具类型名称
 	//$("#maTypeId").val(l.machinesId);//机具类型ID
 	$("#maModelName").val(l.maModel);//规格型号名称
@@ -469,13 +494,13 @@ function setAcceptsForm(data){
 	$("#auAcceptForm input[name$='checkNum']").val(JY.Object.notEmpty(l.checkNum));
 	if(l.exteriorCheck == "1") {
 		$('#exteriorCheck1').prop('checked',true);
-	} 
+	}
 	if(l.exteriorCheck == "0") {
 		$('#exteriorCheck0').prop('checked',true);
 	}
 	if(l.setestCheckx == "1") {
 		$('#testCheck1').prop('checked',true);
-	} 
+	}
 	if(l.testCheck == "0") {
 		$('#testCheck0').prop('checked',true);
 	}
@@ -626,10 +651,10 @@ function batchDeletion(){
 function backShowChenkStatus(){
 	var vals = '';
 	$('input[type=checkbox]:checked').each(function(){
-		var val = $(this).val();	
+		var val = $(this).val();
 		console.log("val=",val);
-		vals += val+"-"; 
+		vals += val+"-";
-		console.log("vals=",vals);	
+		console.log("vals=",vals);
 	})
 	return vals;
 }