From 1ab4b30415d552c11d9e3945dae617e08b3c8eff Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Sat, 14 Sep 2024 10:37:47 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E8=BF=87=E5=AE=A2=E6=88=B7=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=EF=BC=9A=E6=8A=8A?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=90=8D=E5=AD=97=E5=92=8C=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=9A=E7=94=B1=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B71?= =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B72=E3=80=81?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B73=E3=80=81=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=8A=A5=E4=BB=B74=20=E6=8C=89=E7=85=A7=E4=B8=87?= =?UTF-8?q?=E6=9D=90=E8=A6=81=E6=B1=82=E6=94=B9=E6=88=90=EF=BC=9AVantritek?= =?UTF-8?q?-RMB=E3=80=81Vantritek-=E7=BE=8E=E5=85=83=E3=80=81Infinity-RMB?= =?UTF-8?q?=E3=80=81Infinity-=E7=BE=8E=E5=85=83=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E5=8D=95?= =?UTF-8?q?1=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=BC=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E5=8D=952=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA?= =?UTF-8?q?=E8=B4=A7=E7=AE=B1=E5=8D=951=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=87=BA=E8=B4=A7=E7=AE=B1=E5=8D=952=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E5=8F=91=E7=A5=A8?= =?UTF-8?q?1=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=BC=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E5=8F=91=E7=A5=A82=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E9=87=87=E7=94=A8=E6=96=B0=E7=9A=84=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=96=B9=E6=B3=95=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=90=8D=E5=AD=97?= =?UTF-8?q?=20=E5=8E=BB=E6=8E=89=E9=99=84=E4=BB=B6=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=9A=84test=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysCustomerQuoteServiceImpl.java | 29 ++++++++---------- .../{客户报价3.xlsx => Infinity-RMB.xlsx} | Bin ...户报价4.xlsx => Infinity-美元.xlsx} | Bin ...{客户报价1.xlsx => Vantritek-RMB.xlsx} | Bin ...户报价2.xlsx => Vantritek-美元.xlsx} | Bin .../resources/static/attachments/test.docx | 0 6 files changed, 13 insertions(+), 16 deletions(-) rename ruoyi-admin/src/main/resources/static/attachments/{客户报价3.xlsx => Infinity-RMB.xlsx} (100%) rename ruoyi-admin/src/main/resources/static/attachments/{客户报价4.xlsx => Infinity-美元.xlsx} (100%) rename ruoyi-admin/src/main/resources/static/attachments/{客户报价1.xlsx => Vantritek-RMB.xlsx} (100%) rename ruoyi-admin/src/main/resources/static/attachments/{客户报价2.xlsx => Vantritek-美元.xlsx} (100%) delete mode 100644 ruoyi-admin/src/main/resources/static/attachments/test.docx diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index d5c8d15d..227b27cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -449,12 +449,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { @Override public void exportCustomerQuoteOne(String supplierCode, HttpServletResponse response) { - String fileName = "客户报价1.xlsx"; + String fileName = "Vantritek-RMB.xlsx"; - FileDownloadUtils fileDownloadUtils = new FileDownloadUtils(); try { - String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); + String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; @@ -502,7 +501,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); } - ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileRelativePath).build(); + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); workBook.fill(map, sheet); @@ -521,12 +520,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { * */ @Override public void exportCustomerQuoteTwo(String supplierCode, HttpServletResponse response) { - String fileName = "客户报价2.xlsx"; + String fileName = "Vantritek-美元.xlsx"; - FileDownloadUtils fileDownloadUtils = new FileDownloadUtils(); try { - String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); + String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; @@ -567,7 +565,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); } - ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileRelativePath).build(); + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); workBook.fill(map, sheet); @@ -585,12 +583,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { * */ @Override public void exportCustomerQuoteThree(String supplierCode, HttpServletResponse response) { - String fileName = "客户报价3.xlsx"; + String fileName = "Infinity-RMB.xlsx"; - FileDownloadUtils fileDownloadUtils = new FileDownloadUtils(); try { - String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); + String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; @@ -638,7 +635,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); } - ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileRelativePath).build(); + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); workBook.fill(map, sheet); @@ -656,12 +653,12 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { * */ @Override public void exportCustomerQuoteFour(String supplierCode, HttpServletResponse response) { - String fileName = "客户报价4.xlsx"; + String fileName = "Infinity-美元.xlsx"; + - FileDownloadUtils fileDownloadUtils = new FileDownloadUtils(); try { - String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); + String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; @@ -702,7 +699,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); } - ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileRelativePath).build(); + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); workBook.fill(map, sheet); diff --git a/ruoyi-admin/src/main/resources/static/attachments/客户报价3.xlsx b/ruoyi-admin/src/main/resources/static/attachments/Infinity-RMB.xlsx similarity index 100% rename from ruoyi-admin/src/main/resources/static/attachments/客户报价3.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/Infinity-RMB.xlsx diff --git a/ruoyi-admin/src/main/resources/static/attachments/客户报价4.xlsx b/ruoyi-admin/src/main/resources/static/attachments/Infinity-美元.xlsx similarity index 100% rename from ruoyi-admin/src/main/resources/static/attachments/客户报价4.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/Infinity-美元.xlsx diff --git a/ruoyi-admin/src/main/resources/static/attachments/客户报价1.xlsx b/ruoyi-admin/src/main/resources/static/attachments/Vantritek-RMB.xlsx similarity index 100% rename from ruoyi-admin/src/main/resources/static/attachments/客户报价1.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/Vantritek-RMB.xlsx diff --git a/ruoyi-admin/src/main/resources/static/attachments/客户报价2.xlsx b/ruoyi-admin/src/main/resources/static/attachments/Vantritek-美元.xlsx similarity index 100% rename from ruoyi-admin/src/main/resources/static/attachments/客户报价2.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/Vantritek-美元.xlsx diff --git a/ruoyi-admin/src/main/resources/static/attachments/test.docx b/ruoyi-admin/src/main/resources/static/attachments/test.docx deleted file mode 100644 index e69de29b..00000000 From e1d19b270ead01711a18e74857addc1cd5372cac Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 08:46:52 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=9A=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=8E=BB=E6=8E=89=E4=BB=8E=E5=89=8D=E7=AB=AF=E7=94=9F?= =?UTF-8?q?=E6=88=90=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=97=A0=E8=AE=BA=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=B7=BB=E5=8A=A0=E9=83=BD=E4=BC=9A=E6=B5=AA=E8=B4=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=BC=96=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=BB=8E=E5=90=8E=E7=AB=AF=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=92=8C=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E6=B2=A1=E6=9C=89=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysCustomerQuoteServiceImpl.java | 6 ++- .../templates/system/customerQuote/add.html | 50 +++++++++---------- .../system/customerQuote/detail.html | 2 +- .../templates/system/customerQuote/edit.html | 2 +- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java index 227b27cd..6945d23c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java @@ -190,6 +190,10 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { sysCustomerQuote.setCreateBy(loginName); sysCustomerQuote.setCreateTime(DateUtils.getNowDate()); String commonCurrency = sysCustomerQuote.getCommonCurrency(); + //后台获取客户报价编号 + String quoteCode = redisCache.generateBillNo("KHBJ"); + + sysCustomerQuote.setSupplierCode(quoteCode); if (RMB.equals(commonCurrency)){ sysCustomerQuote.setConfirmTax("1"); }else { @@ -202,7 +206,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService { return result; } for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuoteChildList) { - sysCustomerQuoteChild.setQuoteId(sysCustomerQuote.getSupplierCode()); + sysCustomerQuoteChild.setQuoteId(quoteCode); sysCustomerQuoteChild.setCreateTime(new Date()); sysCustomerQuoteChild.setCreateBy(loginName); sysCustomerQuoteChildMapper.insertSysCustomerQuoteChild(sysCustomerQuoteChild); 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 4afb7940..62c3e83d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html @@ -11,12 +11,12 @@
-
- -
- -
-
+ + + + + +
@@ -113,7 +113,7 @@
- +
@@ -607,24 +607,24 @@ } }); }); - function getCustomerCode(){ - //获取单号 - $.ajax({ - url: prefix + "/getId", - type: "post", - dateType: "json", - success: function (resp) { - if (resp.code === 0) { - $("input[name='supplierCode']").val(resp.data); - } else { - $.modal.msgError("失败啦"); - } - }, - error: function () { - $.modal.msgError("后台出错啦！"); - } - }); - } + // function getCustomerCode(){ + // //获取单号 + // $.ajax({ + // url: prefix + "/getId", + // type: "post", + // dateType: "json", + // success: function (resp) { + // if (resp.code === 0) { + // $("input[name='supplierCode']").val(resp.data); + // } else { + // $.modal.msgError("失败啦"); + // } + // }, + // error: function () { + // $.modal.msgError("后台出错啦！"); + // } + // }); + // } function getBusinessMembers(){ /*业务员列表*/ $.ajax({ diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html index 1545e7c7..6a3c95ef 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html @@ -89,7 +89,7 @@
- +
-
- -
-
- - -
-
-
+ + + + + + + + +
@@ -799,7 +799,7 @@ allowClear: true, ajax:{ type: "post", - url:ctx + "system/customer/contactsList2", + url:ctx + "system/customer/contactsList", dataType:"json", delay:250, cache:true, diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html index 26fe2a65..b6a9e32b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html @@ -242,15 +242,15 @@
-
- -
-
- - -
-
-
+ + + + + + + + +
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 3f214f51..542852a9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html @@ -245,15 +245,15 @@
-
- -
-
- - -
-
-
+ + + + + + + + +
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html index 809f7318..c4694bc6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html @@ -211,15 +211,15 @@
-
- -
-
- - -
-
-
+ + + + + + + + +
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html index 401f8a10..a8cb64e0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html @@ -207,15 +207,15 @@
-
- -
-
- - -
-
-
+ + + + + + + + +
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html index 23c21c18..3a05c3b0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html @@ -206,15 +206,15 @@
-
- -
-
- - -
-
-
+ + + + + + + + +
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html index 5172ff46..5b6873d4 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html @@ -206,15 +206,15 @@
-
- -
-
- - -
-
-
+ + + + + + + + +
From 16cfc57e18f3e571bb59a4e7f14d209b40133f00 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 14:05:30 +0800 Subject: [PATCH 4/9] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=95=B0=E5=90=88=E8=AE=A1=E3=80=81=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E4=BB=B7(RMB)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(RMB?= =?UTF-8?q?)=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(?= =?UTF-8?q?=E7=BE=8E=E5=85=83)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E4=BB=B7(=E7=BE=8E=E5=85=83)=E3=80=81=E5=BE=85=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E9=87=8F=E3=80=81=E5=B7=B2=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E3=80=81=E5=AE=9E=E6=94=B6=E9=87=91=E9=A2=9D?= =?UTF-8?q?(RMB)=E3=80=81=E5=AE=9E=E6=94=B6=E9=87=91=E9=A2=9D(=E7=BE=8E?= =?UTF-8?q?=E5=85=83)=EF=BC=8C=E4=B8=8A=E9=9D=A2=E8=BF=99=E4=BA=9B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=90=88=E8=AE=A1=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=88=A4=E6=96=AD=E5=8A=A0=E4=B8=8A=E6=B2=A1=E5=80=BC?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=BA0=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0NaN=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/salesOrder/salesOrder.html | 102 ++++++++++++++++-- 1 file changed, 91 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html index 91bda6d9..ec8773c6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html @@ -271,10 +271,10 @@ sortable: true, // 是否启用排序 sortStable: true, // 设置为 true 将获得稳定的排序 fixedColumns: true, // 启用冻结列 + showFooter: true, rightFixedColumns:1, fixedRightNumber: 1, // 冻结右列个数 modalName: "销售订单", - height: $(window).height() - 100, columns: [ {checkbox: true}, {title: '订单id',field: 'salesOrderId',visible: false}, @@ -343,8 +343,24 @@ {title: '客户ID',field: 'enterpriseCode',}, {title: '客户名称',field: 'enterpriseName'}, {title: '客户订单号',field: 'salesOrderNumber'}, - {title: '物料数合计',field: 'materialSum'}, - {title: '数量合计',field: 'enterpriseSum'}, + {title: '物料数合计',field: 'materialSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].materialSum)|| 0; + } + return "总物料: " + sum; + } + }, + {title: '数量合计',field: 'enterpriseSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].enterpriseSum) || 0; + } + return "总数量: " + sum; + } + }, {title: '是否含税',field:'confirmTax',formatter:function(value, row, index) { return $.table.selectDictLabel(confirmTaxDatas, value); } @@ -353,10 +369,42 @@ {title: '含税单价(RMB)',field: 'rmbTaxPrice',visible:false}, {title: '不含税单价(美元)',field: 'noUsdPrice',visible:false}, {title: '含税单价(美元)',field: 'usdTaxPrice',visible: false}, - {title: '不含税总价(RMB)',field: 'noRmbSum'}, - {title: '含税总价(RMB)',field: 'rmbTaxSum'}, - {title: '不含税总价(美元)',field: 'noUsdSum'}, - {title: '含税总价(美元)',field: 'usdTaxSum'}, + {title: '不含税总价(RMB)',field: 'noRmbSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].noRmbSum)|| 0; + } + return "总不含税总价: " + sum.toFixed(2); + } + }, + {title: '含税总价(RMB)',field: 'rmbTaxSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].rmbTaxSum)|| 0; + } + return "总含税总价: " + sum.toFixed(2); + } + }, + {title: '不含税总价(美元)',field: 'noUsdSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].noUsdSum)|| 0; + } + return "总不含税总价: " + sum.toFixed(2); + } + }, + {title: '含税总价(美元)',field: 'usdTaxSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].usdTaxSum)|| 0; + } + return "总含税总价: " + sum.toFixed(2); + } + }, {title: '计划交付时间',field:'deliveryTime' ,visible: false}, {title: '付款条件',field: 'paymentTerms'}, {title: '交货条件',field: 'deliveryConditions'}, @@ -367,10 +415,42 @@ {title: '接单日期',field: 'orderReceivingTime',visible: false}, {title: '接单方式', field: 'orderReceivingMode',visible: false}, {title: '交货方式',field: 'deliveryMethod',visible: false}, - {title: '待出库数量',field: 'unBoundQuantity'}, - {title: '已出库数量',field: 'outBoundQuantity'}, - {title: '实收金额(RMB)',field:'standbyOne'}, - {title: '实收金额(美元)',field:'standbyTwo'}, + {title: '待出库数量',field: 'unBoundQuantity', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].unBoundQuantity) || 0; + } + return "总待出库数量: " + sum; + } + }, + {title: '已出库数量',field: 'outBoundQuantity', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].outBoundQuantity) || 0; + } + return "总已出库数量: " + sum; + } + }, + {title: '实收金额(RMB)',field:'standbyOne', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].standbyOne) || 0; + } + return "总实收金额: " + sum.toFixed(2); + } + }, + {title: '实收金额(美元)',field:'standbyTwo', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].standbyTwo) || 0; + } + return "总实收金额: " + sum.toFixed(2); + } + }, {title: '录入时间',field:'createTime'}, {title: '更新人',field:'updateBy'}, {title: '更新时间',field:'updateTime'}, From 217398c45e9f1ab82188dbd3fb0f82d1365bf708 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 14:11:15 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[feat]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=EF=BC=9A=20=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E4=BB=B7=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8=EF=BC=9A=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E3=80=81=E5=90=AB=E7=A8=8E=E4=BB=B7=E6=A0=BC=E3=80=81?= =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E4=BB=B7=E6=A0=BC=E3=80=81=E5=90=AB?= =?UTF-8?q?=E7=A8=8E=E6=80=BB=E4=BB=B7=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E?= =?UTF-8?q?=E6=80=BB=E4=BB=B7=EF=BC=8C=E4=B8=8A=E9=9D=A2=E8=BF=99=E4=BA=9B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=90=88=E8=AE=A1=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=88=A4=E6=96=AD=E5=8A=A0=E4=B8=8A=E6=B2=A1=E5=80=BC?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=BA0=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0NaN=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BB=B7=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=9A=E6=95=B0=E9=87=8F=E3=80=81=E5=90=AB=E7=A8=8E=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7=E3=80=81=E4=B8=8D?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7=EF=BC=8C=E4=B8=8A=E9=9D=A2?= =?UTF-8?q?=E8=BF=99=E4=BA=9B=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=BF=9B=E8=A1=8C=E5=90=88=E8=AE=A1=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=B2=A1=E5=80=BC=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?0=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0NaN=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/erp/material/detail.html | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html index 4481bff8..8ff4c7cc 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html @@ -371,7 +371,7 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].materialNum); + sum += parseFloat(value[i].materialNum) || 0; } return "总数量: " + sum; } @@ -387,9 +387,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].taxPrice); + sum += parseFloat(value[i].taxPrice) || 0; } - return "总含税价格: " +sum; + return "总含税价格: " +sum.toFixed(2); } }, { @@ -398,9 +398,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noTaxPrice); + sum += parseFloat(value[i].noTaxPrice) || 0; } - return "总不含税价格: " +sum; + return "总不含税价格: " +sum.toFixed(2); } }, { @@ -409,9 +409,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].taxSum); + sum += parseFloat(value[i].taxSum) || 0; } - return "总含税总价: " +sum; + return "总含税总价: " +sum.toFixed(2); } }, { @@ -420,9 +420,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noTaxSum); + sum += parseFloat(value[i].noTaxSum) || 0; } - return "总不含税总价: " +sum; + return "总不含税总价: " +sum.toFixed(2); } }, { @@ -477,7 +477,7 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].materialNum); + sum += parseFloat(value[i].materialNum) || 0; } return "总数量: " +sum; } @@ -488,9 +488,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].taxPrice); + sum += parseFloat(value[i].taxPrice) || 0; } - return "总含税价格: " +sum; + return "总含税价格: " +sum.toFixed(2); } }, { @@ -499,9 +499,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noTaxPrice); + sum += parseFloat(value[i].noTaxPrice) || 0; } - return "总不含税价格: " +sum; + return "总不含税价格: " +sum.toFixed(2); } }, { @@ -510,9 +510,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].taxSum); + sum += parseFloat(value[i].taxSum) || 0; } - return "总含税总价: " +sum; + return "总含税总价: " +sum.toFixed(2); } }, { @@ -521,9 +521,9 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].noTaxSum); + sum += parseFloat(value[i].noTaxSum) || 0; } - return "总不含税总价: " +sum; + return "总不含税总价: " +sum.toFixed(2); } }, { From 6d263f9d6573bbe898093fddc12d388840c9acac Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 14:21:12 +0800 Subject: [PATCH 6/9] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E9=94=80=E5=94=AE=E5=AE=A2=E6=88=B7=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=9A=E5=BC=80=E5=90=AF=E9=A1=B5=E8=84=9A=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E3=80=81=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=E3=80=81=E4=B8=8D?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(RMB)=E3=80=81=E5=90=AB?= =?UTF-8?q?=E7=A8=8E=E6=80=BB=E4=BB=B7(RMB)=E3=80=81=E4=B8=8D=E5=90=AB?= =?UTF-8?q?=E7=A8=8E=E6=80=BB=E4=BB=B7(=E7=BE=8E=E5=85=83)=E3=80=81?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(=E7=BE=8E=E5=85=83)?= =?UTF-8?q?=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(RMB)?= =?UTF-8?q?=E3=80=81=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(RMB)=E3=80=81?= =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(=E7=BE=8E?= =?UTF-8?q?=E5=85=83)=E3=80=81=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7(?= =?UTF-8?q?=E7=BE=8E=E5=85=83)=EF=BC=8C=E4=B8=8A=E9=9D=A2=E8=BF=99?= =?UTF-8?q?=E4=BA=9B=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=90=88=E8=AE=A1=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=E5=8A=A0=E4=B8=8A=E6=B2=A1?= =?UTF-8?q?=E5=80=BC=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=BA0?= =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0NaN=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/customerQuote/customerQuote.html | 103 ++++++++++++++++-- 1 file changed, 92 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html index f1573e14..5c3a826e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html @@ -131,6 +131,7 @@ exportUrl: prefix + "/export", modalName: "客户报价表", fixedColumns:true, + showFooter: true, fixedRightNumber:1, columns: [ {checkbox: true}, @@ -172,22 +173,102 @@ {title: '客户报价编号',field: 'supplierCode'}, {title: '客户编号',field: 'customerCode'}, {title: '客户名称',field: 'customerName'}, - {title: '物料合计',field: 'enterprise'}, - {title: '数量合计',field: 'enterpriseSum'}, + {title: '物料合计',field: 'enterprise', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].enterprise) || 0; + } + return "总物料合计: " + sum; + } + }, + {title: '数量合计',field: 'enterpriseSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].enterpriseSum) || 0; + } + return "总数量合计: " + sum; + } + }, {title: '报价币种',field: 'commonCurrency', formatter: function (value, row, index) {return $.table.selectDictLabel(currencyDatas, value);} }, {title: '国内汇率',field: 'rmbTax'}, {title: '美元汇率',field: 'usdTax'}, - {title: '不含税总价(RMB)',field: 'noRmbSum'}, - {title: '含税总价(RMB)',field: 'rmbSum'}, - {title: '不含税总价(美元)',field: 'noUsdSum'}, - {title: '含税总价(美元)',field: 'usdSum'}, - - {title: '不含税单价(RMB)',field: 'noRmb'}, - {title: '含税单价(RMB)',field: 'rmb'}, - {title: '不含税单价(美元)',field: 'noUsd'}, - {title: '含税单价(美元)',field: 'usd'}, + {title: '不含税总价(RMB)',field: 'noRmbSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].noRmbSum) || 0; + } + return "总不含税总价: " + sum.toFixed(2); + } + }, + {title: '含税总价(RMB)',field: 'rmbSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].rmbSum) || 0; + } + return "总含税总价: " + sum.toFixed(2); + } + }, + {title: '不含税总价(美元)',field: 'noUsdSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].noUsdSum) || 0; + } + return "总不含税总价: " + sum.toFixed(2); + } + }, + {title: '含税总价(美元)',field: 'usdSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].usdSum) || 0; + } + return "总含税总价: " + sum.toFixed(2); + } + }, + + {title: '不含税单价(RMB)',field: 'noRmb', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].noRmb) || 0; + } + return "总不含税单价: " + sum.toFixed(2); + } + }, + {title: '含税单价(RMB)',field: 'rmb', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].rmb) || 0; + } + return "总含税单价: " + sum.toFixed(2); + } + }, + {title: '不含税单价(美元)',field: 'noUsd', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].noUsd) || 0; + } + return "总不含税单价: " + sum.toFixed(2); + } + }, + {title: '含税单价(美元)',field: 'usd', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].usd) || 0; + } + return "总含税单价: " + sum.toFixed(2); + } + }, {title: '定价时间',field: 'pricingDate'}, {title: '录入人',field: 'createBy'}, {title: '录入时间',field: 'createTime'}, From f7af85da485ca4a10c7b2721de64c8425cf4b906 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 14:28:51 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=B7=B2=E7=BB=8F=E5=8A=A0=E4=B8=8A=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=A9=BA?= =?UTF-8?q?=E5=80=BC=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salesShippingInform/salesShippingInform.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html index ee196812..f3f8c5e9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html @@ -177,7 +177,7 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].materialSum); + sum += parseFloat(value[i].materialSum)|| 0;; } return "总物料: " + sum; } @@ -188,7 +188,7 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].enterpriseSum); + sum += parseFloat(value[i].enterpriseSum)|| 0;; } return "总数量: " + sum; } @@ -200,7 +200,7 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].allPriceExcludingTaxRmb); + sum += parseFloat(value[i].allPriceExcludingTaxRmb)|| 0;; } return "总不含税总价: " + sum.toFixed(2); } @@ -211,7 +211,7 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].allPriceExcludingTaxDollar); + sum += parseFloat(value[i].allPriceExcludingTaxDollar)|| 0;; } return "总不含税总价: " + sum.toFixed(2); } @@ -222,7 +222,7 @@ footerFormatter: function (value) { var sum = 0; for (var i in value) { - sum += parseFloat(value[i].allPriceIncludesTax); + sum += parseFloat(value[i].allPriceIncludesTax)|| 0;; } return "总含税总价: " + sum.toFixed(2); } From d459af3dafd40e98c65336717ce55a1f20945614 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 15:19:35 +0800 Subject: [PATCH 8/9] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E9=94=80=E5=94=AE=E5=94=AE=E5=90=8E=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8D=95=EF=BC=9A=E6=80=BB=E7=89=A9=E6=96=99=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E3=80=81=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E4=B8=8A=E9=9D=A2=E8=BF=99=E4=BA=9B=E5=AD=97=E6=AE=B5=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=89=8D=E7=AB=AF=E8=BF=9B=E8=A1=8C=E5=90=88=E8=AE=A1?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=B2=A1=E5=80=BC=E9=BB=98=E8=AE=A4=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA0=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA?= =?UTF-8?q?=E7=8E=B0NaN=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../afterSalesNotice/afterSalesNotice.html | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html index 54f79498..f6ae01e6 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html +++ b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html @@ -56,7 +56,7 @@
-
+
@@ -83,6 +83,7 @@ cancelUrl: prefix + "/cancel/{id}", restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", + showFooter: true, modalName: "售后通知单", columns: [{ checkbox: true @@ -188,10 +189,24 @@ { title: '物料数合计', field: 'materialSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].materialSum) || 0; + } + return "总物料合计: " + sum; + } }, { title: '数量合计', field: 'enterpriseSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].enterpriseSum) || 0; + } + return "总数量合计: " + sum; + } }, { title: '联系人', From c62401f0797ac8f17cd2a675f6a713a183f60be4 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 17 Sep 2024 16:25:56 +0800 Subject: [PATCH 9/9] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=9A=E5=90=AF=E7=94=A8=E9=A1=B5=E8=84=9A=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E3=80=81=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=90=88=E8=AE=A1=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E?= =?UTF-8?q?=E6=80=BB=E4=BB=B7(RMB)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E4=BB=B7(RMB)=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7(?= =?UTF-8?q?=E7=BE=8E=E5=85=83)=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E?= =?UTF-8?q?=E6=80=BB=E4=BB=B7(=E7=BE=8E=E5=85=83)=EF=BC=8C=E4=B8=8A?= =?UTF-8?q?=E9=9D=A2=E8=BF=99=E4=BA=9B=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=BF=9B=E8=A1=8C=E5=90=88=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E6=B2=A1=E5=80=BC=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA0=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0NaN?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E9=94=80=E5=94=AE=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=90=AF=E7=94=A8=E5=86=BB=E7=BB=93?= =?UTF-8?q?=E5=88=97=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=86=BB=E7=BB=93=E6=9C=80?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=92=8C=E6=9C=80=E5=8F=B3=E4=BE=A7=E4=B8=80?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E5=90=AF=E7=94=A8=E9=A1=B5=E8=84=9A=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E4=B8=BA?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E5=A4=A7=E5=B0=8F=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E3=80=81=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=90=88=E8=AE=A1=EF=BC=8C=E4=B8=8A=E9=9D=A2=E8=BF=99?= =?UTF-8?q?=E4=BA=9B=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=90=88=E8=AE=A1=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=E5=8A=A0=E4=B8=8A=E6=B2=A1?= =?UTF-8?q?=E5=80=BC=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=BA0?= =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0NaN=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../afterSalesNotice/afterSalesNotice.html | 4 ++ .../templates/sales/estimate/estimate.html | 51 +++++++++++++++++-- 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html index f6ae01e6..8404ec3a 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html +++ b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html @@ -84,6 +84,10 @@ restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", showFooter: true, + sortStable: true, // 设置为 true 将获得稳定的排序 + fixedColumns: true, // 启用冻结列 + rightFixedColumns:1, + fixedRightNumber: 1, // 冻结右列个数 modalName: "售后通知单", columns: [{ checkbox: true diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html index 5a2cbf60..bab98ce2 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html +++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html @@ -90,6 +90,7 @@ fixedColumns: true, // 启用冻结列 rightFixedColumns:1, fixedRightNumber: 1, // 冻结右列个数 + showFooter: true, modalName: "销售估价", columns: [{ checkbox: true @@ -129,10 +130,24 @@ { title: '物料合计', field: 'materialSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].materialSum) || 0; + } + return "总物料合计: " + sum; + } }, { title: '数量合计', field: 'enterpriseSum', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].enterpriseSum) || 0; + } + return "总数量合计: " + sum; + } }, { title: '估价币种', @@ -142,20 +157,48 @@ } }, { - title: '不含税总价', + title: '不含税总价(RMB)', field: 'allNoTaxRmb', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].allNoTaxRmb) || 0; + } + return "总不含税总价: " + sum.toFixed(2); + } }, { - title: '含税总价', + title: '含税总价(RMB)', field: 'allTaxRmb', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].allTaxRmb) || 0; + } + return "总含税总价: " + sum.toFixed(2); + } }, { - title: '含税总价', + title: '含税总价(美元)', field: 'allTaxDollar', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].allTaxDollar) || 0; + } + return "总含税总价: " + sum.toFixed(2); + } }, { - title: '不含税总价', + title: '不含税总价(美元)', field: 'allNoTaxDollar', + footerFormatter: function (value) { + var sum = 0; + for (var i in value) { + sum += parseFloat(value[i].allNoTaxDollar) || 0; + } + return "总不含税总价: " + sum.toFixed(2); + } }, { title: '录入人',