From 57e48de6adc43a290823f9e8aa5697f867770614 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 16 Nov 2022 16:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=A9=E6=96=99=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application-in_scanQrCode.html | 3 +- .../pages/application/application-out.html | 33 ++++++++++++++++++ .../application-out_scanQrCode.html | 3 +- .../application/application-transfer.html | 34 +++++++++++++++++-- .../application-transfer_back.html | 3 +- .../pages/stockTaking/stockTaking.html | 3 +- 6 files changed, 73 insertions(+), 6 deletions(-) diff --git a/target/classes/templates/pages/application/application-in_scanQrCode.html b/target/classes/templates/pages/application/application-in_scanQrCode.html index 87f860bf..15e38515 100644 --- a/target/classes/templates/pages/application/application-in_scanQrCode.html +++ b/target/classes/templates/pages/application/application-in_scanQrCode.html @@ -668,7 +668,8 @@ maxmin: true, shadeClose: true, //点击遮罩关闭层 area: ['70%', '70%'], - content: '/selectMaterialByCard?mname=' + mname + '&type=1&clickObj=' + parentId, + // content: '/selectMaterialByCard?mname=' + mname + '&type=1&clickObj=' + parentId, + content: '/getMaterialAll?mname=' + mname + '&type=1&clickObj=' + parentId, move: '.layui-layer-title', fixed: false, end: function () { diff --git a/target/classes/templates/pages/application/application-out.html b/target/classes/templates/pages/application/application-out.html index ce7cb943..4afbe263 100644 --- a/target/classes/templates/pages/application/application-out.html +++ b/target/classes/templates/pages/application/application-out.html @@ -575,6 +575,9 @@ var materialName = materialItem[1]; var materialId = materialName.parentNode.parentNode.childNodes[3]; var mname = materialName.value; + var barCodeChildren = parent.childNodes[9]; + // 条形码条码 + var barCodeItem = barCodeChildren.childNodes[3]; layer.open({ type: 2, title: '弹窗内容', @@ -600,6 +603,36 @@ code = ""; } codeValue.value = code; + var materialAndBarCodeList = material["materialAndBarCodeList"]; + var idNumber = materialId.name.split("mid")[1]; + if (materialAndBarCodeList.length > 0) { + // 如果有对应的条形码 + var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; + var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; + var id = barCodeInput.id; + $("#" + id).remove(); + $("#barCode" + idNumber).empty(); + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } else { + var barCodeSelect = ` + `; + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } + else{ + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } + } form.render(); } }); diff --git a/target/classes/templates/pages/application/application-out_scanQrCode.html b/target/classes/templates/pages/application/application-out_scanQrCode.html index 1e7be332..4b7c7bdb 100644 --- a/target/classes/templates/pages/application/application-out_scanQrCode.html +++ b/target/classes/templates/pages/application/application-out_scanQrCode.html @@ -500,7 +500,8 @@ maxmin: true, shadeClose: true, //点击遮罩关闭层 area: ['70%', '70%'], - content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + // content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId, move : '.layui-layer-title', fixed:false, end: function () { diff --git a/target/classes/templates/pages/application/application-transfer.html b/target/classes/templates/pages/application/application-transfer.html index 109b22c3..ee0bad75 100644 --- a/target/classes/templates/pages/application/application-transfer.html +++ b/target/classes/templates/pages/application/application-transfer.html @@ -576,7 +576,6 @@ contentType: "application/json;charset=utf-8", success:function (res) { var idNumber = materialId.name.split("mid")[1]; - console.log(idNumber) // 获取物料与条形码的对应关系 var materialAndBarCodeList = d["materialAndBarCodeList"]; var barCode = $("#barCode" + idNumber); @@ -631,6 +630,8 @@ var materialName = materialItem[1]; var materialId = materialName.parentNode.parentNode.childNodes[3]; var mname = materialName.value; + var barCodeChildren = parent.childNodes[9]; + var barCodeItem = barCodeChildren.childNodes[3]; layer.open({ type: 2, title: '弹窗内容', @@ -638,7 +639,8 @@ maxmin: true, shadeClose: true, //点击遮罩关闭层 area: ['70%', '70%'], - content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + // content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId, move : '.layui-layer-title', fixed:false, end: function () { @@ -660,6 +662,34 @@ $.each(placeList, function (index, item) { $('#place').append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素 }); + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } + var idNumber = materialId.name.split("mid")[1]; + var materialAndBarCodeList = material["materialAndBarCodeList"]; + if (materialAndBarCodeList.length > 0) { + // 如果有对应的条形码 + var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; + var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; + var id = barCodeInput.id; + $("#" + id).remove(); + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } else { + var barCodeSelect = ` + `; + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); + + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } form.render(); } }); diff --git a/target/classes/templates/pages/application/application-transfer_back.html b/target/classes/templates/pages/application/application-transfer_back.html index 1e94f3e3..90baa339 100644 --- a/target/classes/templates/pages/application/application-transfer_back.html +++ b/target/classes/templates/pages/application/application-transfer_back.html @@ -382,7 +382,8 @@ maxmin: true, shadeClose: true, //点击遮罩关闭层 area: ['70%', '70%'], - content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + // content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId, + content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId, move : '.layui-layer-title', fixed:false, end: function () { diff --git a/target/classes/templates/pages/stockTaking/stockTaking.html b/target/classes/templates/pages/stockTaking/stockTaking.html index 2bbc72f4..025c3d7c 100644 --- a/target/classes/templates/pages/stockTaking/stockTaking.html +++ b/target/classes/templates/pages/stockTaking/stockTaking.html @@ -665,7 +665,8 @@ area: ['70%', '70%'], move: '.layui-layer-title', fixed: false, - content: '/selectMaterialByCardForTaking?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId, + content: '/getMaterialAll?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId, + // content: '/selectMaterialByCardForTaking?mname=' + mname + '&type=3&clickObj=' + parentId + '&placeId=' + placeId + '&depositoryId=' + depositoryId, end: function () { var mid = materialId.value; $.ajax({