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

[fix] 

修改销售出货通知分页查询接口，根据创建时间降序排序;
修改销售出货通知前端页面：修改列表页面表头的按钮，按钮采用统一样式；修改操作栏按钮样式样式统一，操作栏引用$.table.dropdownToggle方法；去掉多余的列表展示字段；销售订单号、收货地址字段加上tooltip方法，超过5个字符隐藏部分内容；所有前端展示字段全部居中对齐
dev
liuxiaoxu 3 weeks ago
parent
d88dfb9bd8
commit
690b7a78b7
2 changed files with 63 additions and 37 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. 1
      ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml
  2. 99
      ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html

1
ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformMapper.xml
View File

@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseOrderType != null and warehouseOrderType != ''"> and warehouse_order_type = #{warehouseOrderType}</if> <if test="warehouseOrderType != null and warehouseOrderType != ''"> and warehouse_order_type = #{warehouseOrderType}</if>
<if test="businessMembers != null and businessMembers != ''"> and business_members = #{businessMembers}</if> <if test="businessMembers != null and businessMembers != ''"> and business_members = #{businessMembers}</if>
</where> </where>
order by create_time desc
</select> </select>
<select id="selectSysSalesShippingInformById" parameterType="Long" resultMap="SysSalesShippingInformResult"> <select id="selectSysSalesShippingInformById" parameterType="Long" resultMap="SysSalesShippingInformResult">

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

@ -46,37 +46,37 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:salesShippingInform:export"> <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:salesShippingInform:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
<!-- <div class="dropdown">--> <!-- <div class="dropdown">-->
<a class="btn btn-warning" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="btn btn-success" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-download"></i> 模板导出 <i class="fa fa-download"></i> 模板导出
</a> </a>
<div class="dropdown-menu" aria-labelledby="dropdownMenu2"> <div class="dropdown-menu" aria-labelledby="dropdownMenu2">
<a class="btn btn-warning" onclick="exportShippingOrderOne()" shiro:hasPermission="system:salesShippingInform:exportShippingOrderOne"> <a class="btn btn-success" onclick="exportShippingOrderOne()" shiro:hasPermission="system:salesShippingInform:exportShippingOrderOne">
<i class="fa fa-download"></i> 导出销售出货单1 <i class="fa fa-download"></i> 导出销售出货单1
</a> </a>
<a class="btn btn-warning" onclick="exportShippingOrderTwo()" shiro:hasPermission="system:salesShippingInform:exportShippingOrderTwo"> <a class="btn btn-success" onclick="exportShippingOrderTwo()" shiro:hasPermission="system:salesShippingInform:exportShippingOrderTwo">
<i class="fa fa-download"></i> 导出销售出货单2 <i class="fa fa-download"></i> 导出销售出货单2
</a> </a>
<a class="btn btn-warning" onclick="exportShippingPackingOne()" shiro:hasPermission="system:salesShippingInform:exportShippingPackingOne"> <a class="btn btn-success" onclick="exportShippingPackingOne()" shiro:hasPermission="system:salesShippingInform:exportShippingPackingOne">
<i class="fa fa-download"></i> 导出销售出货箱单1 <i class="fa fa-download"></i> 导出销售出货箱单1
</a> </a>
<a class="btn btn-warning" onclick="exportShippingPackingTwo()" shiro:hasPermission="system:salesShippingInform:exportShippingPackingTwo"> <a class="btn btn-success" onclick="exportShippingPackingTwo()" shiro:hasPermission="system:salesShippingInform:exportShippingPackingTwo">
<i class="fa fa-download"></i> 导出销售出货箱单2 <i class="fa fa-download"></i> 导出销售出货箱单2
</a> </a>
<a class="btn btn-warning" onclick="exportShippingInvoiceOne()" shiro:hasPermission="system:salesShippingInform:exportShippingInvoiceOne"> <a class="btn btn-success" onclick="exportShippingInvoiceOne()" shiro:hasPermission="system:salesShippingInform:exportShippingInvoiceOne">
<i class="fa fa-download"></i> 导出销售出货发票1 <i class="fa fa-download"></i> 导出销售出货发票1
</a> </a>
<a class="btn btn-warning" onclick="exportShippingInvoiceTwo()" shiro:hasPermission="system:salesShippingInform:exportShippingInvoiceTwo"> <a class="btn btn-success" onclick="exportShippingInvoiceTwo()" shiro:hasPermission="system:salesShippingInform:exportShippingInvoiceTwo">
<i class="fa fa-download"></i> 导出销售出货发票2 <i class="fa fa-download"></i> 导出销售出货发票2
</a> </a>
<a class="btn btn-warning" onclick="exportShippingInformOrder()" shiro:hasPermission="system:salesShippingInform:exportShippingInformOrder"> <a class="btn btn-success" onclick="exportShippingInformOrder()" shiro:hasPermission="system:salesShippingInform:exportShippingInformOrder">
<i class="fa fa-download"></i> 导出销售出货通知单 <i class="fa fa-download"></i> 导出销售出货通知单
</a> </a>
</div> </div>
@ -116,7 +116,6 @@
showFooter: true, showFooter: true,
fixedColumns: true, // 启用冻结列 fixedColumns: true, // 启用冻结列
fixedRightNumber: 1, // 冻结右列个数 fixedRightNumber: 1, // 冻结右列个数
//height: $(window).height() - 120,
modalName: "销售出货通知", modalName: "销售出货通知",
columns: [{ columns: [{
checkbox: true checkbox: true
@ -129,10 +128,12 @@
{ {
title: '出库单号', title: '出库单号',
field: 'outOrderCode', field: 'outOrderCode',
align: 'center',
}, },
{ {
title: '出库状态', title: '出库状态',
field: 'warehouseOutStatus', field: 'warehouseOutStatus',
align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(warehouseOutStatusDatas, value); return $.table.selectDictLabel(warehouseOutStatusDatas, value);
} }
@ -140,22 +141,28 @@
{ {
title: '业务员', title: '业务员',
field: 'businessMembers', field: 'businessMembers',
align: 'center',
}, },
{ {
title: '关联销售订单号', title: '关联销售订单号',
field: 'salesOrderCode', field: 'salesOrderCode',
}, align: 'center',
{
title: '订单类型',
field: 'warehouseOrderType',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(warehouseOrderTypeDatas, value); return $.table.tooltip(value, 5, "open");
} }
}, },
// {
// title: '订单类型',
// field: 'warehouseOrderType',
// formatter: function(value, row, index) {
// return $.table.selectDictLabel(warehouseOrderTypeDatas, value);
// }
// },
{ {
title: '出库类型', title: '出库类型',
field: 'warehouseOutType', field: 'warehouseOutType',
align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(warehouseOutTypeDatas, value); return $.table.selectDictLabel(warehouseOutTypeDatas, value);
} }
@ -164,19 +171,22 @@
{ {
title: '客户ID', title: '客户ID',
field: 'customerId', field: 'customerId',
align: 'center',
}, },
{ {
title: '客户名称', title: '客户名称',
field: 'customerName', field: 'customerName',
align: 'center',
}, },
{ // {
title: '客户订单号', // title: '客户订单号',
field: 'salesOrderNumber', // field: 'salesOrderNumber',
}, // },
{ {
title: '物料合计', title: '物料合计',
field: 'materialSum', field: 'materialSum',
align: 'center',
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
@ -188,6 +198,7 @@
{ {
title: '数量合计', title: '数量合计',
field: 'enterpriseSum', field: 'enterpriseSum',
align: 'center',
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
@ -200,6 +211,7 @@
{ {
title: '不含税总价(RMB)', title: '不含税总价(RMB)',
field: 'allPriceExcludingTaxRmb', field: 'allPriceExcludingTaxRmb',
align: 'center',
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
@ -211,6 +223,7 @@
{ {
title: '不含税总价(美元)', title: '不含税总价(美元)',
field: 'allPriceExcludingTaxDollar', field: 'allPriceExcludingTaxDollar',
align: 'center',
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
@ -222,6 +235,7 @@
{ {
title: '含税总价', title: '含税总价',
field: 'allPriceIncludesTax', field: 'allPriceIncludesTax',
align: 'center',
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
@ -230,56 +244,67 @@
return "总含税总价: " + sum.toFixed(2); return "总含税总价: " + sum.toFixed(2);
} }
}, },
{ // {
title: '计划交付时间', // title: '计划交付时间',
field: 'plannedDeliveryTime', // field: 'plannedDeliveryTime',
}, // },
{ // {
title: '客户验收时间', // title: '客户验收时间',
field: 'acceptanceTime', // field: 'acceptanceTime',
}, // },
{ // {
title: '付款条件', // title: '付款条件',
field: 'paymentCondition', // field: 'paymentCondition',
}, // },
{ // {
title: '交付条件', // title: '交付条件',
field: 'deliveryCondition', // field: 'deliveryCondition',
}, // },
{ {
title: '收货联系人', title: '收货联系人',
field: 'customerContact', field: 'customerContact',
align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.tooltip(value, 10, "open"); return $.table.tooltip(value, 5, "open");
} }
}, },
{ {
title: '联系电话', title: '联系电话',
field: 'contactNumber', field: 'contactNumber',
align: 'center',
}, },
{ {
title: '收货地址', title: '收货地址',
field: 'customerContactAddress', field: 'customerContactAddress',
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value, 5, "open");
}
}, },
{ {
title: '送货日期', title: '送货日期',
field: 'deliverTime', field: 'deliverTime',
align: 'center',
}, },
{ {
title: '录入时间', title: '录入时间',
field: 'createTime', field: 'createTime',
align: 'center',
}, },
{ {
title: '录入人', title: '录入人',
field: 'createBy', field: 'createBy',
align: 'center',
}, },
{ {
title: '更新人', title: '更新人',
field: 'updateBy', field: 'updateBy',
align: 'center',
}, },
{ {
title: '上次更新时间', title: '上次更新时间',
field: 'updateTime', field: 'updateTime',
align: 'center',
}, },
{ {

Write Preview
Loading…
Cancel
Save