From 185d15d5cc186f06df7811d89d4c4483123b9d93 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 31 Mar 2023 15:25:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E3=80=81?= =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=81=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/pages/depository/table-stock.html | 9 +++++++-- .../templates/pages/material/material-out.html | 12 +++++++++--- .../pages/materialtype/materialType_view.html | 12 +++++++++--- .../templates/pages/depository/table-stock.html | 9 +++++++-- .../templates/pages/material/material-out.html | 12 +++++++++--- .../pages/materialtype/materialType_view.html | 12 +++++++++--- 6 files changed, 50 insertions(+), 16 deletions(-) diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html index bb17ff3b..2dc8e6e6 100644 --- a/src/main/resources/templates/pages/depository/table-stock.html +++ b/src/main/resources/templates/pages/depository/table-stock.html @@ -382,7 +382,8 @@ layer.full(index); }); return false; - } else if (obj.event === 'applicationOut') { + } + else if (obj.event === 'applicationOut') { // 出库申请 var index = layer.open({ title: '出库申请', @@ -397,7 +398,8 @@ layer.full(index); }); return false; - } else if (obj.event === 'changeUnit') { + } + else if (obj.event === 'changeUnit') { let showQuantity = data.showQuantity; let btn = $("#btn_" + data.id); let clickNum = Number(btn.attr("click_num")); @@ -433,6 +435,9 @@ } } + else if(obj.event === 'import'){ + bindTableToolbarFunction() + } }); // 用于更改同一仓库下的库位 diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html index ff1999f7..d0b9c449 100644 --- a/src/main/resources/templates/pages/material/material-out.html +++ b/src/main/resources/templates/pages/material/material-out.html @@ -468,7 +468,8 @@ $(window).on("resize", function () { layer.full(index); }); - } else if (obj.event === 'delete') { // 监听删除操作 + } + else if (obj.event === 'delete') { // 监听删除操作 var checkStatus = table.checkStatus('currentTableId') , data = checkStatus.data; var req = {}; @@ -513,7 +514,8 @@ layer.msg("未选中记录，请确认！"); return false; } - } else if (obj.event === 'applicationIn') { + } + else if (obj.event === 'applicationIn') { // 入库申请 var checkStatus = table.checkStatus('currentTableId') , data = checkStatus.data; @@ -554,9 +556,13 @@ } }) - } else if (obj.event === 'downloadFile') { + } + else if (obj.event === 'downloadFile') { window.open("/download/materialImportDownload", "_self"); } + else if(obj.event === 'import'){ + bindTableToolbarFunction() + } }); diff --git a/src/main/resources/templates/pages/materialtype/materialType_view.html b/src/main/resources/templates/pages/materialtype/materialType_view.html index 8a0fb118..51129e54 100644 --- a/src/main/resources/templates/pages/materialtype/materialType_view.html +++ b/src/main/resources/templates/pages/materialtype/materialType_view.html @@ -205,7 +205,8 @@ $(window).on("resize", function () { layer.full(index); }); - } else if (obj.event === 'delete') { // 监听删除操作 + } + else if (obj.event === 'delete') { // 监听删除操作 var checkStatus = table.checkStatus('currentTableId') , data = checkStatus.data; var req = {}; @@ -250,9 +251,13 @@ layer.msg("未选中记录，请确认！"); return false; } - } else if (obj.event === 'downloadFile') { + } + else if (obj.event === 'downloadFile') { window.open("/download/materialTypeImportDownload", "_self"); } + else if(obj.event === 'import'){ + bindTableToolbarFunction() + } }); @@ -449,7 +454,8 @@ layer.full(index); }); return false; - } else if (obj.event === 'delete') { + } + else if (obj.event === 'delete') { var req = {}; req.id = data.oldId; $.ajax({ diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html index bb17ff3b..2dc8e6e6 100644 --- a/target/classes/templates/pages/depository/table-stock.html +++ b/target/classes/templates/pages/depository/table-stock.html @@ -382,7 +382,8 @@ layer.full(index); }); return false; - } else if (obj.event === 'applicationOut') { + } + else if (obj.event === 'applicationOut') { // 出库申请 var index = layer.open({ title: '出库申请', @@ -397,7 +398,8 @@ layer.full(index); }); return false; - } else if (obj.event === 'changeUnit') { + } + else if (obj.event === 'changeUnit') { let showQuantity = data.showQuantity; let btn = $("#btn_" + data.id); let clickNum = Number(btn.attr("click_num")); @@ -433,6 +435,9 @@ } } + else if(obj.event === 'import'){ + bindTableToolbarFunction() + } }); // 用于更改同一仓库下的库位 diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html index ff1999f7..d0b9c449 100644 --- a/target/classes/templates/pages/material/material-out.html +++ b/target/classes/templates/pages/material/material-out.html @@ -468,7 +468,8 @@ $(window).on("resize", function () { layer.full(index); }); - } else if (obj.event === 'delete') { // 监听删除操作 + } + else if (obj.event === 'delete') { // 监听删除操作 var checkStatus = table.checkStatus('currentTableId') , data = checkStatus.data; var req = {}; @@ -513,7 +514,8 @@ layer.msg("未选中记录，请确认！"); return false; } - } else if (obj.event === 'applicationIn') { + } + else if (obj.event === 'applicationIn') { // 入库申请 var checkStatus = table.checkStatus('currentTableId') , data = checkStatus.data; @@ -554,9 +556,13 @@ } }) - } else if (obj.event === 'downloadFile') { + } + else if (obj.event === 'downloadFile') { window.open("/download/materialImportDownload", "_self"); } + else if(obj.event === 'import'){ + bindTableToolbarFunction() + } }); diff --git a/target/classes/templates/pages/materialtype/materialType_view.html b/target/classes/templates/pages/materialtype/materialType_view.html index 8a0fb118..51129e54 100644 --- a/target/classes/templates/pages/materialtype/materialType_view.html +++ b/target/classes/templates/pages/materialtype/materialType_view.html @@ -205,7 +205,8 @@ $(window).on("resize", function () { layer.full(index); }); - } else if (obj.event === 'delete') { // 监听删除操作 + } + else if (obj.event === 'delete') { // 监听删除操作 var checkStatus = table.checkStatus('currentTableId') , data = checkStatus.data; var req = {}; @@ -250,9 +251,13 @@ layer.msg("未选中记录，请确认！"); return false; } - } else if (obj.event === 'downloadFile') { + } + else if (obj.event === 'downloadFile') { window.open("/download/materialTypeImportDownload", "_self"); } + else if(obj.event === 'import'){ + bindTableToolbarFunction() + } }); @@ -449,7 +454,8 @@ layer.full(index); }); return false; - } else if (obj.event === 'delete') { + } + else if (obj.event === 'delete') { var req = {}; req.id = data.oldId; $.ajax({