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 55bb10c0..0855626b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
@@ -6,93 +6,6 @@
-
@@ -272,7 +185,7 @@
sortStable: true, // 设置为 true 将获得稳定的排序
fixedColumns: true, // 启用冻结列
showFooter: true,
- rightFixedColumns:1,
+ // rightFixedColumns:1,
fixedRightNumber: 1, // 冻结右列个数
modalName: "销售订单",
columns: [
@@ -284,8 +197,20 @@
{title: '流程恢复实例ID',field: 'restoreInstanceId', visible: false},
{ title: '流程实例类型', field: 'instanceTypeName',visible: false},
{title: '申请人ID',field: 'applyUser', visible: false},
+ {title: '当前任务ID',field: 'taskId',visible: false},
+ { title: '待办用户ID',field: 'todoUserId', visible: false},
+ { title: '当前任务名称',field: 'taskName',visible: false,
+ formatter: function(value, row, index) {
+ return '' + value + '';
+ }
- {title: '当前状态',field: 'taskStatus',
+ },
+ {title: '审核状态',field: 'auditStatus',visible: false,
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(auditStatusDatas, value);}
+ },
+
+ {title: '当前状态',field: 'taskStatus', align: 'center',
formatter: function(value, row, index) {
if(row.auditStatus!="1"&&value != "未启动"){
return '' + value + '';
@@ -296,11 +221,11 @@
return '' + value + '';}
},
- {title: '销售订单编号',field: 'salesOrderCode'},
- {title: '客户订单编号',field: 'salesOrderNumber'},
- {title: '客户ID',field: 'enterpriseCode',},
- {title: '客户名称',field: 'enterpriseName'},
- {title: '物料数合计',field: 'materialSum',
+ {title: '销售订单编号',field: 'salesOrderCode', align: 'center',},
+ {title: '客户订单编号',field: 'salesOrderNumber', align: 'center',},
+ {title: '客户ID',field: 'enterpriseCode', align: 'center',},
+ {title: '客户名称',field: 'enterpriseName', align: 'center',},
+ {title: '物料数合计',field: 'materialSum', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -309,7 +234,7 @@
return "总物料: " + sum;
}
},
- {title: '数量合计',field: 'enterpriseSum',
+ {title: '数量合计',field: 'enterpriseSum', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -318,12 +243,7 @@
return "总数量: " + sum;
}
},
-
- {title: '不含税单价(RMB)',field: 'noRmbPrice',visible:false},
- {title: '含税单价(RMB)',field: 'rmbTaxPrice',visible:false},
- {title: '不含税单价(美元)',field: 'noUsdPrice',visible:false},
- {title: '含税单价(美元)',field: 'usdTaxPrice',visible: false},
- {title: '不含税总价(RMB)',field: 'noRmbSum',
+ {title: '不含税总价(RMB)',field: 'noRmbSum', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -332,7 +252,7 @@
return "总不含税总价: " + sum.toFixed(2);
}
},
- {title: '含税总价(RMB)',field: 'rmbTaxSum',
+ {title: '含税总价(RMB)',field: 'rmbTaxSum', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -341,7 +261,7 @@
return "总含税总价: " + sum.toFixed(2);
}
},
- {title: '不含税总价(美元)',field: 'noUsdSum',
+ {title: '不含税总价(美元)',field: 'noUsdSum', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -350,7 +270,7 @@
return "总不含税总价: " + sum.toFixed(2);
}
},
- {title: '含税总价(美元)',field: 'usdTaxSum',
+ {title: '含税总价(美元)',field: 'usdTaxSum', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -361,67 +281,63 @@
},
{
- field: 'applyUserName',
+ field: 'applyUserName', align: 'center',
title: '申请人',
formatter: function(value, row, index) {
return '' + (value ? value : "-") + '';
}
},
- {field: 'applyTime',title: '申请时间'
+ {field: 'applyTime',title: '申请时间', align: 'center',
},
- {title: '当前任务ID',field: 'taskId',visible: false},
- { title: '待办用户ID',field: 'todoUserId', visible: false},
- { title: '当前任务名称',field: 'taskName',visible: false,
- formatter: function(value, row, index) {
- return '' + value + '';
- }
- },
- {title: '审核状态',field: 'auditStatus',visible: false,
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(auditStatusDatas, value);}
- },
- {title: '使用状态',field: 'useStatus',formatter:function(value, row, index) {
+ {title: '使用状态',field: 'useStatus', align: 'center',formatter:function(value, row, index) {
return $.table.selectDictLabel(useStatusDatas, value);}
},
- {title: '生产状态',field: 'makeStatus',formatter:function(value, row, index) {
+ {title: '生产状态',field: 'makeStatus', align: 'center',formatter:function(value, row, index) {
return $.table.selectDictLabel(makeStatusDatas, value);}
},
- {title: '出货状态',field: 'deliveryStatus',formatter:function(value, row, index) {
+ {title: '出货状态',field: 'deliveryStatus', align: 'center',formatter:function(value, row, index) {
return $.table.selectDictLabel(deliveryStatusDatas, value);}
},
- {title: '收款结案状态',field:'closeStatus',formatter:function(value, row, index){
+ {title: '收款结案状态',field:'closeStatus', align: 'center',formatter:function(value, row, index){
return $.table.selectDictLabel(closeStatusDatas, value);
}
},
- {title: '业务人员',field: 'businessMembers',visible: false},
- {title: '是否开票',field:'invoice',formatter:function(value, row, index){
+
+ {title: '是否开票',field:'invoice', align: 'center',formatter:function(value, row, index){
return $.table.selectDictLabel(sysWhetherDatas, value);
}
},
- {title: '订单类型',field: 'salesOrderType',formatter: function(value, row, index) {
+ {title: '订单类型',field: 'salesOrderType', align: 'center',formatter: function(value, row, index) {
return $.table.selectDictLabel(salesOrderTypeDatas, value);
}
},
+ {title: '是否含税',field:'confirmTax' ,align: 'center',formatter:function(value, row, index) {
+ return $.table.selectDictLabel(confirmTaxDatas, value);
+ }
+ },
- {title: '是否含税',field:'confirmTax',formatter:function(value, row, index) {
- return $.table.selectDictLabel(confirmTaxDatas, value);
+ {title: '付款条件',field: 'paymentTerms', align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value, 5, "open");
+ }
+ },
+ {title: '交货条件',field: 'deliveryConditions', align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value, 5, "open");
+ }
+ },
+ {title: '联系人',field: 'customerContact', align: 'center',},
+ {title: '联系电话',field: 'contactNumber', align: 'center',},
+ {title: '收货地址',field: 'deliveryAddress', align: 'center',
+ formatter: function(value, row, index) {
+ return $.table.tooltip(value, 5, "open");
}
},
- {title: '计划交付时间',field:'deliveryTime' ,visible: false},
- {title: '付款条件',field: 'paymentTerms'},
- {title: '交货条件',field: 'deliveryConditions'},
- {title: '联系人',field: 'customerContact'},
- {title: '联系电话',field: 'contactNumber'},
- {title: '传真号码',field: 'customerFax',visible: false},
- {title: '收货地址',field: 'deliveryAddress'},
- {title: '接单日期',field: 'orderReceivingTime',visible: false},
- {title: '接单方式', field: 'orderReceivingMode',visible: false},
- {title: '交货方式',field: 'deliveryMethod',visible: false},
- {title: '待出库数量',field: 'unBoundQuantity',
+ {title: '待出库数量',field: 'unBoundQuantity', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -430,7 +346,7 @@
return "总待出库数量: " + sum;
}
},
- {title: '已出库数量',field: 'outBoundQuantity',
+ {title: '已出库数量',field: 'outBoundQuantity', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -439,7 +355,7 @@
return "总已出库数量: " + sum;
}
},
- {title: '实收金额(RMB)',field:'standbyOne',
+ {title: '实收金额(RMB)',field:'standbyOne', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -448,7 +364,7 @@
return "总实收金额: " + sum.toFixed(2);
}
},
- {title: '实收金额(美元)',field:'standbyTwo',
+ {title: '实收金额(美元)',field:'standbyTwo', align: 'center',
footerFormatter: function (value) {
var sum = 0;
for (var i in value) {
@@ -457,15 +373,15 @@
return "总实收金额: " + sum.toFixed(2);
}
},
- {title: '录入时间',field:'createTime'},
- {title: '更新人',field:'updateBy'},
- {title: '更新时间',field:'updateTime'},
- {title: '备注',field:'remark'},
+ {title: '录入时间',field:'createTime', align: 'center',},
+ {title: '更新人',field:'updateBy', align: 'center',},
+ {title: '更新时间',field:'updateTime', align: 'center',},
+ {title: '备注',field:'remark', align: 'center',},
{title: '操作',align: 'center',formatter: function (value, row, index) {
var actions = [];
if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId) {
// 作废
- actions.push(' 作废');
+ actions.push(' 作废');
// 已作废
}
@@ -475,7 +391,7 @@
// 有流程实例id
if(row.useStatus=="2" && !row.restoreInstanceId){
// 恢复
- actions.push(' 恢复 ');
+ actions.push(' 恢复 ');
}
// 有流程实例id
if (row.instanceId) {
@@ -484,25 +400,26 @@
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
- actions.push(' '+nodeName+' ');
+ actions.push(' '+nodeName+' ');
}
}
// 审批历史
- actions.push(' 审批历史 ');
+ actions.push(' 审批历史 ');
// 进度查看
- actions.push(' 进度查看 ');
+ actions.push(' 进度查看 ');
}
// 生产状态部分完成/全部完成
if (row.makeStatus == "5" || row.makeStatus == "6"){
- actions.push('出货 ');
+ actions.push('出货 ');
}
if (row.closeStatus == 3){
- actions.push('售后 ');
+ actions.push('售后 ');
}
// 详情
- actions.push(' 详情 ');
- return actions.join('');
+ actions.push(' 详情 ');
+ var actionLinks = actions.join('');
+ return $.table.dropdownToggle(actionLinks);
}
}
],