root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
王晓迪 4 days ago
parent
f96d08424b c62401f079
commit
4754776177
22 changed files with 382 additions and 158 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
  2. 0
      ruoyi-admin/src/main/resources/static/attachments/Infinity-RMB.xlsx
  3. 0
      ruoyi-admin/src/main/resources/static/attachments/Infinity-美元.xlsx
  4. 0
      ruoyi-admin/src/main/resources/static/attachments/Vantritek-RMB.xlsx
  5. 0
      ruoyi-admin/src/main/resources/static/attachments/Vantritek-美元.xlsx
  6. 0
      ruoyi-admin/src/main/resources/static/attachments/test.docx
  7. 36
      ruoyi-admin/src/main/resources/templates/erp/material/detail.html
  8. 21
      ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html
  9. 51
      ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html
  10. 50
      ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
  11. 103
      ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
  12. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
  13. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
  14. 20
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  15. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
  16. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
  17. 102
      ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
  18. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
  19. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
  20. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
  21. 18
      ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
  22. 10
      ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html

35
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java
View File

@ -190,6 +190,10 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
sysCustomerQuote.setCreateBy(loginName); sysCustomerQuote.setCreateBy(loginName);
sysCustomerQuote.setCreateTime(DateUtils.getNowDate()); sysCustomerQuote.setCreateTime(DateUtils.getNowDate());
String commonCurrency = sysCustomerQuote.getCommonCurrency(); String commonCurrency = sysCustomerQuote.getCommonCurrency();
//后台获取客户报价编号
String quoteCode = redisCache.generateBillNo("KHBJ");
sysCustomerQuote.setSupplierCode(quoteCode);
if (RMB.equals(commonCurrency)){ if (RMB.equals(commonCurrency)){
sysCustomerQuote.setConfirmTax("1"); sysCustomerQuote.setConfirmTax("1");
}else { }else {
@ -202,7 +206,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
return result; return result;
} }
for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuoteChildList) { for (SysCustomerQuoteChild sysCustomerQuoteChild : sysCustomerQuoteChildList) {
sysCustomerQuoteChild.setQuoteId(sysCustomerQuote.getSupplierCode()); sysCustomerQuoteChild.setQuoteId(quoteCode);
sysCustomerQuoteChild.setCreateTime(new Date()); sysCustomerQuoteChild.setCreateTime(new Date());
sysCustomerQuoteChild.setCreateBy(loginName); sysCustomerQuoteChild.setCreateBy(loginName);
sysCustomerQuoteChildMapper.insertSysCustomerQuoteChild(sysCustomerQuoteChild); sysCustomerQuoteChildMapper.insertSysCustomerQuoteChild(sysCustomerQuoteChild);
@ -449,12 +453,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
@Override @Override
public void exportCustomerQuoteOne(String supplierCode, HttpServletResponse response) { public void exportCustomerQuoteOne(String supplierCode, HttpServletResponse response) {
String fileName = "客户报价1.xlsx"; String fileName = "Vantritek-RMB.xlsx";
FileDownloadUtils fileDownloadUtils = new FileDownloadUtils();
try { try {
String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName);
String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx";
@ -502,7 +505,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); 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(); WriteSheet sheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
workBook.fill(map, sheet); workBook.fill(map, sheet);
@ -521,12 +524,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
* */ * */
@Override @Override
public void exportCustomerQuoteTwo(String supplierCode, HttpServletResponse response) { public void exportCustomerQuoteTwo(String supplierCode, HttpServletResponse response) {
String fileName = "客户报价2.xlsx"; String fileName = "Vantritek-美元.xlsx";
FileDownloadUtils fileDownloadUtils = new FileDownloadUtils();
try { try {
String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName);
String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx";
@ -567,7 +569,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); 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(); WriteSheet sheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
workBook.fill(map, sheet); workBook.fill(map, sheet);
@ -585,12 +587,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
* */ * */
@Override @Override
public void exportCustomerQuoteThree(String supplierCode, HttpServletResponse response) { public void exportCustomerQuoteThree(String supplierCode, HttpServletResponse response) {
String fileName = "客户报价3.xlsx"; String fileName = "Infinity-RMB.xlsx";
FileDownloadUtils fileDownloadUtils = new FileDownloadUtils();
try { try {
String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName);
String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx";
@ -638,7 +639,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); 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(); WriteSheet sheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
workBook.fill(map, sheet); workBook.fill(map, sheet);
@ -656,12 +657,12 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
* */ * */
@Override @Override
public void exportCustomerQuoteFour(String supplierCode, HttpServletResponse response) { public void exportCustomerQuoteFour(String supplierCode, HttpServletResponse response) {
String fileName = "客户报价4.xlsx"; String fileName = "Infinity-美元.xlsx";
FileDownloadUtils fileDownloadUtils = new FileDownloadUtils();
try { try {
String fileRelativePath = fileDownloadUtils.getFileRelativePath(fileName); String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName);
String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx"; String realFileName = supplierCode +"-" + fileName.substring(0, fileName.indexOf(".")) + ".xlsx";
@ -702,7 +703,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo); 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(); WriteSheet sheet = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
workBook.fill(map, sheet); workBook.fill(map, sheet);

0
ruoyi-admin/src/main/resources/static/attachments/客户报价3.xlsx → ruoyi-admin/src/main/resources/static/attachments/Infinity-RMB.xlsx
View File

0
ruoyi-admin/src/main/resources/static/attachments/客户报价4.xlsx → ruoyi-admin/src/main/resources/static/attachments/Infinity-美元.xlsx
View File

0
ruoyi-admin/src/main/resources/static/attachments/客户报价1.xlsx → ruoyi-admin/src/main/resources/static/attachments/Vantritek-RMB.xlsx
View File

0
ruoyi-admin/src/main/resources/static/attachments/客户报价2.xlsx → ruoyi-admin/src/main/resources/static/attachments/Vantritek-美元.xlsx
View File

0
ruoyi-admin/src/main/resources/static/attachments/test.docx
View File

36
ruoyi-admin/src/main/resources/templates/erp/material/detail.html
View File

@ -371,7 +371,7 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].materialNum); sum += parseFloat(value[i].materialNum) || 0;
} }
return "总数量: " + sum; return "总数量: " + sum;
} }
@ -387,9 +387,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { 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) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { 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) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { 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) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { 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) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].materialNum); sum += parseFloat(value[i].materialNum) || 0;
} }
return "总数量: " +sum; return "总数量: " +sum;
} }
@ -488,9 +488,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { 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) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { 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) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { 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) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].noTaxSum); sum += parseFloat(value[i].noTaxSum) || 0;
} }
return "总不含税总价: " +sum; return "总不含税总价: " +sum.toFixed(2);
} }
}, },
{ {

21
ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html
View File

@ -56,7 +56,7 @@
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table" style="white-space:nowrap"></table>
</div> </div>
</div> </div>
</div> </div>
@ -83,6 +83,11 @@
cancelUrl: prefix + "/cancel/{id}", cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}", restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
showFooter: true,
sortStable: true, // 设置为 true 将获得稳定的排序
fixedColumns: true, // 启用冻结列
rightFixedColumns:1,
fixedRightNumber: 1, // 冻结右列个数
modalName: "售后通知单", modalName: "售后通知单",
columns: [{ columns: [{
checkbox: true checkbox: true
@ -188,10 +193,24 @@
{ {
title: '物料数合计', title: '物料数合计',
field: 'materialSum', field: 'materialSum',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].materialSum) || 0;
}
return "总物料合计: " + sum;
}
}, },
{ {
title: '数量合计', title: '数量合计',
field: 'enterpriseSum', field: 'enterpriseSum',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].enterpriseSum) || 0;
}
return "总数量合计: " + sum;
}
}, },
{ {
title: '联系人', title: '联系人',

51
ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html
View File

@ -90,6 +90,7 @@
fixedColumns: true, // 启用冻结列 fixedColumns: true, // 启用冻结列
rightFixedColumns:1, rightFixedColumns:1,
fixedRightNumber: 1, // 冻结右列个数 fixedRightNumber: 1, // 冻结右列个数
showFooter: true,
modalName: "销售估价", modalName: "销售估价",
columns: [{ columns: [{
checkbox: true checkbox: true
@ -129,10 +130,24 @@
{ {
title: '物料合计', title: '物料合计',
field: 'materialSum', field: 'materialSum',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].materialSum) || 0;
}
return "总物料合计: " + sum;
}
}, },
{ {
title: '数量合计', title: '数量合计',
field: 'enterpriseSum', field: 'enterpriseSum',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].enterpriseSum) || 0;
}
return "总数量合计: " + sum;
}
}, },
{ {
title: '估价币种', title: '估价币种',
@ -142,20 +157,48 @@
} }
}, },
{ {
title: '不含税总价', title: '不含税总价(RMB)',
field: 'allNoTaxRmb', 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', 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', 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', field: 'allNoTaxDollar',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
sum += parseFloat(value[i].allNoTaxDollar) || 0;
}
return "总不含税总价: " + sum.toFixed(2);
}
}, },
{ {
title: '录入人', title: '录入人',

50
ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
View File

@ -11,12 +11,12 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-customerQuote-add"> <form class="form-horizontal m" id="form-customerQuote-add">
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-4 control-label">客户报价编号：</label> <!-- <label class="col-sm-4 control-label">客户报价编号：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<input name="supplierCode" class="form-control" type="text" readonly> <!-- <input name="supplierCode" class="form-control" type="text" readonly>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group" shiro:hasPermission="system:customerQuote:edit"> <div class="form-group" shiro:hasPermission="system:customerQuote:edit">
<label class="col-sm-4 control-label">业务员：</label> <label class="col-sm-4 control-label">业务员：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -113,7 +113,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">备注说明：</label> <label class="col-sm-4 control-label">备注说明：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="remark" class="form-control" readonly></textarea> <textarea name="remark" class="form-control"></textarea>
</div> </div>
</div> </div>
@ -607,24 +607,24 @@
} }
}); });
}); });
function getCustomerCode(){ // function getCustomerCode(){
//获取单号 // //获取单号
$.ajax({ // $.ajax({
url: prefix + "/getId", // url: prefix + "/getId",
type: "post", // type: "post",
dateType: "json", // dateType: "json",
success: function (resp) { // success: function (resp) {
if (resp.code === 0) { // if (resp.code === 0) {
$("input[name='supplierCode']").val(resp.data); // $("input[name='supplierCode']").val(resp.data);
} else { // } else {
$.modal.msgError("失败啦"); // $.modal.msgError("失败啦");
} // }
}, // },
error: function () { // error: function () {
$.modal.msgError("后台出错啦！"); // $.modal.msgError("后台出错啦！");
} // }
}); // });
} // }
function getBusinessMembers(){ function getBusinessMembers(){
/*业务员列表*/ /*业务员列表*/
$.ajax({ $.ajax({

103
ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
View File

@ -131,6 +131,7 @@
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "客户报价表", modalName: "客户报价表",
fixedColumns:true, fixedColumns:true,
showFooter: true,
fixedRightNumber:1, fixedRightNumber:1,
columns: [ columns: [
{checkbox: true}, {checkbox: true},
@ -172,22 +173,102 @@
{title: '客户报价编号',field: 'supplierCode'}, {title: '客户报价编号',field: 'supplierCode'},
{title: '客户编号',field: 'customerCode'}, {title: '客户编号',field: 'customerCode'},
{title: '客户名称',field: 'customerName'}, {title: '客户名称',field: 'customerName'},
{title: '物料合计',field: 'enterprise'}, {title: '物料合计',field: 'enterprise',
{title: '数量合计',field: 'enterpriseSum'}, 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', {title: '报价币种',field: 'commonCurrency',
formatter: function (value, row, index) {return $.table.selectDictLabel(currencyDatas, value);} formatter: function (value, row, index) {return $.table.selectDictLabel(currencyDatas, value);}
}, },
{title: '国内汇率',field: 'rmbTax'}, {title: '国内汇率',field: 'rmbTax'},
{title: '美元汇率',field: 'usdTax'}, {title: '美元汇率',field: 'usdTax'},
{title: '不含税总价(RMB)',field: 'noRmbSum'}, {title: '不含税总价(RMB)',field: 'noRmbSum',
{title: '含税总价(RMB)',field: 'rmbSum'}, footerFormatter: function (value) {
{title: '不含税总价(美元)',field: 'noUsdSum'}, var sum = 0;
{title: '含税总价(美元)',field: 'usdSum'}, for (var i in value) {
sum += parseFloat(value[i].noRmbSum) || 0;
{title: '不含税单价(RMB)',field: 'noRmb'}, }
{title: '含税单价(RMB)',field: 'rmb'}, return "总不含税总价: " + sum.toFixed(2);
{title: '不含税单价(美元)',field: 'noUsd'}, }
{title: '含税单价(美元)',field: 'usd'}, },
{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: 'pricingDate'},
{title: '录入人',field: 'createBy'}, {title: '录入人',field: 'createBy'},
{title: '录入时间',field: 'createTime'}, {title: '录入时间',field: 'createTime'},

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
View File

@ -89,7 +89,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">备注说明：</label> <label class="col-sm-4 control-label">备注说明：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea> <textarea readonly name="remark" th:text="*{remark}" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="container" style="display: none;"> <div class="container" style="display: none;">

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
View File

@ -89,7 +89,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">备注说明：</label> <label class="col-sm-4 control-label">备注说明：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea readonly name="remark" th:field="*{remark}" class="form-control"></textarea> <textarea readonly name="remark" th:text="*{remark}" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="container" style="display: none;"> <div class="container" style="display: none;">

20
ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
View File

@ -234,15 +234,15 @@
<input name="deliveryConditions" class="form-control" type="text"> <input name="deliveryConditions" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">计划交付时间：</label> <!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<div class="input-group date"> <!-- <div class="input-group date">-->
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text"> <!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text">-->
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label> <label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -799,7 +799,7 @@
allowClear: true, allowClear: true,
ajax:{ ajax:{
type: "post", type: "post",
url:ctx + "system/customer/contactsList2", url:ctx + "system/customer/contactsList",
dataType:"json", dataType:"json",
delay:250, delay:250,
cache:true, cache:true,

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
View File

@ -242,15 +242,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" disabled> <input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" disabled>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">计划交付时间：</label> <!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<div class="input-group date"> <!-- <div class="input-group date">-->
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:value="*{deliveryTime}" disabled/> <!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:value="*{deliveryTime}" disabled/>-->
<span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span> <!-- <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label> <label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
View File

@ -245,15 +245,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text"> <input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">计划交付时间：</label> <!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<div class="input-group date"> <!-- <div class="input-group date">-->
<input name="deliveryTime" th:field="*{deliveryTime}" class="form-control" placeholder="yyyy-mm-dd" type="text" /> <!-- <input name="deliveryTime" th:field="*{deliveryTime}" class="form-control" placeholder="yyyy-mm-dd" type="text" />-->
<span class="input-group-addon" ><i class="fa fa-calendar"></i></span> <!-- <span class="input-group-addon" ><i class="fa fa-calendar"></i></span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label> <label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">

102
ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
View File

@ -271,10 +271,10 @@
sortable: true, // 是否启用排序 sortable: true, // 是否启用排序
sortStable: true, // 设置为 true 将获得稳定的排序 sortStable: true, // 设置为 true 将获得稳定的排序
fixedColumns: true, // 启用冻结列 fixedColumns: true, // 启用冻结列
showFooter: true,
rightFixedColumns:1, rightFixedColumns:1,
fixedRightNumber: 1, // 冻结右列个数 fixedRightNumber: 1, // 冻结右列个数
modalName: "销售订单", modalName: "销售订单",
height: $(window).height() - 100,
columns: [ columns: [
{checkbox: true}, {checkbox: true},
{title: '订单id',field: 'salesOrderId',visible: false}, {title: '订单id',field: 'salesOrderId',visible: false},
@ -343,8 +343,24 @@
{title: '客户ID',field: 'enterpriseCode',}, {title: '客户ID',field: 'enterpriseCode',},
{title: '客户名称',field: 'enterpriseName'}, {title: '客户名称',field: 'enterpriseName'},
{title: '客户订单号',field: 'salesOrderNumber'}, {title: '客户订单号',field: 'salesOrderNumber'},
{title: '物料数合计',field: 'materialSum'}, {title: '物料数合计',field: 'materialSum',
{title: '数量合计',field: 'enterpriseSum'}, 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) { {title: '是否含税',field:'confirmTax',formatter:function(value, row, index) {
return $.table.selectDictLabel(confirmTaxDatas, value); return $.table.selectDictLabel(confirmTaxDatas, value);
} }
@ -353,10 +369,42 @@
{title: '含税单价(RMB)',field: 'rmbTaxPrice',visible:false}, {title: '含税单价(RMB)',field: 'rmbTaxPrice',visible:false},
{title: '不含税单价(美元)',field: 'noUsdPrice',visible:false}, {title: '不含税单价(美元)',field: 'noUsdPrice',visible:false},
{title: '含税单价(美元)',field: 'usdTaxPrice',visible: false}, {title: '含税单价(美元)',field: 'usdTaxPrice',visible: false},
{title: '不含税总价(RMB)',field: 'noRmbSum'}, {title: '不含税总价(RMB)',field: 'noRmbSum',
{title: '含税总价(RMB)',field: 'rmbTaxSum'}, footerFormatter: function (value) {
{title: '不含税总价(美元)',field: 'noUsdSum'}, var sum = 0;
{title: '含税总价(美元)',field: 'usdTaxSum'}, 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:'deliveryTime' ,visible: false},
{title: '付款条件',field: 'paymentTerms'}, {title: '付款条件',field: 'paymentTerms'},
{title: '交货条件',field: 'deliveryConditions'}, {title: '交货条件',field: 'deliveryConditions'},
@ -367,10 +415,42 @@
{title: '接单日期',field: 'orderReceivingTime',visible: false}, {title: '接单日期',field: 'orderReceivingTime',visible: false},
{title: '接单方式', field: 'orderReceivingMode',visible: false}, {title: '接单方式', field: 'orderReceivingMode',visible: false},
{title: '交货方式',field: 'deliveryMethod',visible: false}, {title: '交货方式',field: 'deliveryMethod',visible: false},
{title: '待出库数量',field: 'unBoundQuantity'}, {title: '待出库数量',field: 'unBoundQuantity',
{title: '已出库数量',field: 'outBoundQuantity'}, footerFormatter: function (value) {
{title: '实收金额(RMB)',field:'standbyOne'}, var sum = 0;
{title: '实收金额(美元)',field:'standbyTwo'}, 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:'createTime'},
{title: '更新人',field:'updateBy'}, {title: '更新人',field:'updateBy'},
{title: '更新时间',field:'updateTime'}, {title: '更新时间',field:'updateTime'},

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
View File

@ -211,15 +211,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text"> <input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">计划交付时间：</label> <!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<div class="input-group date"> <!-- <div class="input-group date">-->
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" /> <!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" />-->
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label> <label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
View File

@ -207,15 +207,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" readonly> <input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">计划交付时间：</label> <!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<div class="input-group date"> <!-- <div class="input-group date">-->
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/> <!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/>-->
<span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span> <!-- <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label> <label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
View File

@ -206,15 +206,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" readonly> <input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">计划交付时间：</label> <!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<div class="input-group date"> <!-- <div class="input-group date">-->
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/> <!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/>-->
<span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span> <!-- <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label> <label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">

18
ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
View File

@ -206,15 +206,15 @@
<input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" readonly> <input name="deliveryConditions" th:field="*{deliveryConditions}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="col-sm-3 control-label">计划交付时间：</label> <!-- <label class="col-sm-3 control-label">计划交付时间：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<div class="input-group date"> <!-- <div class="input-group date">-->
<input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/> <!-- <input name="deliveryTime" class="form-control" placeholder="yyyy-mm-dd" type="text" th:field="*{deliveryTime}" readonly/>-->
<span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span> <!-- <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">客户验收时间：</label> <label class="col-sm-3 control-label">客户验收时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">

10
ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
View File

@ -177,7 +177,7 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].materialSum); sum += parseFloat(value[i].materialSum)|| 0;;
} }
return "总物料: " + sum; return "总物料: " + sum;
} }
@ -188,7 +188,7 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].enterpriseSum); sum += parseFloat(value[i].enterpriseSum)|| 0;;
} }
return "总数量: " + sum; return "总数量: " + sum;
} }
@ -200,7 +200,7 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].allPriceExcludingTaxRmb); sum += parseFloat(value[i].allPriceExcludingTaxRmb)|| 0;;
} }
return "总不含税总价: " + sum.toFixed(2); return "总不含税总价: " + sum.toFixed(2);
} }
@ -211,7 +211,7 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].allPriceExcludingTaxDollar); sum += parseFloat(value[i].allPriceExcludingTaxDollar)|| 0;;
} }
return "总不含税总价: " + sum.toFixed(2); return "总不含税总价: " + sum.toFixed(2);
} }
@ -222,7 +222,7 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].allPriceIncludesTax); sum += parseFloat(value[i].allPriceIncludesTax)|| 0;;
} }
return "总含税总价: " + sum.toFixed(2); return "总含税总价: " + sum.toFixed(2);
} }

Write Preview
Loading…
Cancel
Save