diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html index 2f9a6cde..134cc63b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html @@ -363,6 +363,7 @@ { title: '物料的含税单价(美元)',field: 'materialUsd',align: 'center',}, { title: '物料的含税总价(美元)',field: 'materialUsdSum', align: 'center',}, { title: '物料的不含税总价(美元)',field: 'materialNoUsdSum',align: 'center',}, + { title: '物料的含税总价(RMB)',field: 'materialRmb',align: 'center',}, { title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',}, {title: '物料的不含税总价(RMB)',field: 'materialRmbSum',align: 'center',}, {field: 'createBy', align: 'center',title: '录入人',visible: false}, @@ -497,8 +498,6 @@ } }) layer.close(index); - var enterpriseSum = $("#enterpriseSum_add").val(); - $("#enterpriseSum_add").val((enterpriseSum==null?0:enterpriseSum) + 1); } function insertRow() { if ($("#customerCode").val() == null || $("#customerCode").val() == '') { diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html index 828a715e..fd3e564f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html @@ -426,6 +426,7 @@ countTax: '', usdTax: '', materialSole: "", + materialRmb: "", materialNum: "", materialNoRmb: "", materialNoUsd: "", @@ -455,8 +456,6 @@ field: 'id', values: rowData.id }) - let enterpriseSum = $("#enterpriseSum_edit").val(); - $("#enterpriseSum_edit").val((enterpriseSum==null?0:enterpriseSum) - rowData.materialNum); } $("input[name='pricingDate']").datetimepicker({ format: "yyyy-mm-dd", diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html index ee69b6f6..01829814 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html @@ -477,8 +477,6 @@ field: 'id', values: rowData.id }) - let enterpriseSum = $("#enterpriseSum_edit").val(); - $("#enterpriseSum_edit").val((enterpriseSum==null?0:enterpriseSum) - rowData.materialNum); } $("input[name='pricingDate']").datetimepicker({ format: "yyyy-mm-dd",