From 975823f4d07c91a67162f553be9ff4ac25f3d47d Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 06 十一月 2025 13:41:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czkhasrs' into czkhasrs
---
src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js b/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js
index b8471e1..c17bedc 100644
--- a/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js
+++ b/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js
@@ -185,19 +185,46 @@
});
}
break;
+ // case 'clampData':
+ // layer.open({
+ // type: 2,
+ // title: '骞舵澘',
+ // maxmin: true,
+ // area: [top.detailWidth, top.detailHeight],
+ // content: 'barcodeMatnr_clamp.html',
+ // success: function(layero, index){
+ // layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ // clearFormVal(layer.getChildFrame('#detail', index));
+ // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ // }
+ // });
+ // break;
case 'clampData':
- layer.open({
- type: 2,
- title: '骞舵澘',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'barcodeMatnr_clamp.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- }
- });
+ if (checkStatus.data.length === 0){
+ layer.msg('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�', {icon: 2});
+ } else {
+ layer.confirm('纭畾骞舵澘鍚�', function(){
+ $.ajax({
+ url: baseUrl+"/barcodeMatnr/clamp/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(checkStatus.data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ });
+ }
break;
case 'exportData':
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
@@ -367,20 +394,20 @@
method("add");
});
- form.on('submit(save1)', function () {
+ form.on('submit(comb)', function () {
if (banMsg != null){
layer.msg(banMsg);
return;
}
- method("add1");
+ method("comb");
});
- form.on('submit(save2)', function () {
+ form.on('submit(clamp)', function () {
if (banMsg != null){
layer.msg(banMsg);
return;
}
- method("add2");
+ method("clamp");
});
// 鏁版嵁淇敼鍔ㄤ綔
--
Gitblit v1.9.1