From 27e3eb58217441dc3d656fb5640dc552a2599199 Mon Sep 17 00:00:00 2001 From: hwd <582708352@qq.com> Date: Sat, 27 Sep 2025 10:45:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=96=B0=E5=A2=9E=E6=9D=83?= =?UTF-8?q?=E9=99=90=E2=80=9C=E9=9A=90=E8=97=8F=E9=87=87=E8=B4=AD=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E2=80=9D=EF=BC=8C=E9=80=89=E4=B8=AD=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=96=99=E5=8D=95=E6=9F=A5=E7=9C=8B=E6=98=8E=E7=BB=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=9A=90=E8=97=8F=E9=87=87=E8=B4=AD=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/materialOrder/conduit/view.html | 36 +++++++++++++++---- .../webapp/WEB-INF/template/role/add.html | 2 +- .../webapp/WEB-INF/template/role/edit.html | 2 +- .../webapp/WEB-INF/template/role/view.html | 2 +- .../webapp/resources/js/permissionData.js | 3 ++ 5 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/template/materialOrder/conduit/view.html b/src/main/webapp/WEB-INF/template/materialOrder/conduit/view.html index 37b76cd..3e29970 100644 --- a/src/main/webapp/WEB-INF/template/materialOrder/conduit/view.html +++ b/src/main/webapp/WEB-INF/template/materialOrder/conduit/view.html @@ -153,7 +153,12 @@
+ + + +
+ + + @@ -241,14 +248,20 @@ + + - + @@ -512,7 +525,14 @@ 'shortDescription', 'longDescription', 'gWeight', 'totalWeight','needCount', 'count','useStockCount', 'unit', 'bigProductType', 'bigProductDes', 'smallProductType', 'smallProductDes', 'makeCode', 'makeName', 'diameterL', 'diameterS', 'jacketSpec', 'wallThicknessL', 'wallThicknessS', 'size', 'pressureLevel', 'endFace', 'material', 'materialType', - 'insulationCode', 'specialRequest', 'memo', 'supplierNameList', 'confirmSuppliers', 'supplierName', 'price'] + 'insulationCode', 'specialRequest', 'memo'] + var hasPurchaseInfo = $('#addTable').attr('data-columns').indexOf('hidePurchaseInfo') === -1; + if (hasPurchaseInfo) { + tableFieldList.push('supplierNameList'); + tableFieldList.push('confirmSuppliers'); + tableFieldList.push('supplierName'); + tableFieldList.push('price'); + } function loadItem() { var thisName var thisValue @@ -567,12 +587,14 @@ } } html = html + - " " @@ -597,12 +619,14 @@ } } html = html + - " " htmlAll += html; diff --git a/src/main/webapp/WEB-INF/template/role/add.html b/src/main/webapp/WEB-INF/template/role/add.html index 918e20a..d1ea889 100644 --- a/src/main/webapp/WEB-INF/template/role/add.html +++ b/src/main/webapp/WEB-INF/template/role/add.html @@ -66,7 +66,7 @@ - + + +
隔热代号 特殊要求 备注供应商列表 确认供应商列表 中标供应商 中标价格 操作 批量确认 + + 批量确认 + +
\n" + + " \n" + if (hasPurchaseInfo) { // " 查看报价\n" + - " 供应商列表\n"; + html = html + " 供应商列表\n"; if (item.confirmSuppliers != null || !item.confirmSuppliers){ html = html +" 确认供应商\n" } + } html = html+" "+ "
\n" + + " \n" + if (hasPurchaseInfo) { // " 查看报价\n" + - " 供应商列表\n" ; + html = html + " 供应商列表\n" ; if (item.confirmSuppliers != null || !item.confirmSuppliers){ html = html + " 确认供应商\n" } + } html = html+" "+ "