diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index f69ededd..ec866919 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -480,7 +480,7 @@ row.materialUsdSum = Number(row.materialNum * Number(row.materialUsd)).toFixed(2); } - else if( commonCurrency1 == 2){ + else if(commonCurrency1 == 2){ row.materialNoUsd = Number(row.materialNoUsd).toFixed(2); row.materialUsd = Number(row.materialNoUsd).toFixed(2); row.materialUsdSum = Number(row.materialNum * row.materialUsd).toFixed(2); @@ -681,16 +681,16 @@ photoUrl: rowData.photoUrl, countTax: '', usdTax: '', - materialNum: "", materialSole: "", - materialRmb: "", - materialNoRmb: "", - materialNoUsd: "", - materialUsd: "", - materialUsdSum: "", - materialNoUsdSum: "", - materialNoRmbSum: "", - materialRmbSum: "", + materialNum: 0, + materialNoRmb: 0.00, + materialNoUsd: 0.00, + materialRmb: 0.00, + materialNoRmbSum: 0.00, + materialRmbSum: 0.00, + materialUsd: 0.00, + materialUsdSum: 0.00, + materialNoUsdSum: 0.00, createBy: "", createTime: "", updateBy: "", @@ -718,18 +718,18 @@ $.modal.openOptions(options); } /* 删除指定表格行 */ - function removeRow(id){ + function removeRow(index){ $("#bootstrap-sub-table-order").bootstrapTable('remove', { - field: 'id', - values: id + field: 'index', + values: index }) } function getTotalAmount(){ // $("#addFinishbomTable").bootstrapTable('refresh'); - let getData = $("#bootstrap-sub-table-order").bootstrapTable('getData', true); - let enterprise = Number(0);let enterpriseSum = Number(0); let noRmb = Number(0); - let rmb = Number(0);let noRmbSum = Number(0);let rmbSum = Number(0);let noUsd = Number(0); - let usd = Number(0);let noUsdSum = Number(0); let usdSum = Number(0); + let getData = $("#bootstrap-sub-table-order").bootstrapTable('getData'); + let enterprise = Number(0);let enterpriseSum = Number(0).toFixed(0); let noRmb = Number(0).toFixed(0); + let rmb = Number(0).toFixed(2);let noRmbSum =Number(0).toFixed(2);let rmbSum = Number(0).toFixed(2);let noUsd = Number(0).toFixed(2); + let usd = Number(0).toFixed(2);let noUsdSum = Number(0).toFixed(2); let usdSum = Number(0).toFixed(2); $("#enterprise_add").val(0); $("#enterpriseSum_add").val(0); $("#noRmb_add").val(0); diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html new file mode 100644 index 00000000..573eef0c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html @@ -0,0 +1,724 @@ + + + + + + + + + + + + + + + +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+

计算

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+
+ 选择报价信息 + + 添加物料 + +
+
+
+
+
+
+
+
+
+ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html index 59d33deb..4386946c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html @@ -72,7 +72,7 @@