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+" "+ "