Browse Source

[feat] 销售管理

销售订单列表页面新增:物料数合计、数量合计、不含税总价(RMB)、含税总价(RMB)、不含税总价(美元)、含税总价(美元)、待出库数量、已出库数量、实收金额(RMB)、实收金额(美元),上面这些字段新增前端进行合计,并且进行判断加上没值默认设置为0,防止出现NaN问题
dev
liuxiaoxu 5 days ago
parent
commit
16cfc57e18
  1. 102
      ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html

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

@ -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'},

Loading…
Cancel
Save