|
|
@ -285,7 +285,7 @@ |
|
|
|
{ title: '流程实例类型', field: 'instanceTypeName',visible: false}, |
|
|
|
{title: '申请人ID',field: 'applyUser', visible: false}, |
|
|
|
|
|
|
|
{title: '当前状态',field: 'taskStatus',align: 'center', |
|
|
|
{title: '当前状态',field: 'taskStatus', |
|
|
|
formatter: function(value, row, index) { |
|
|
|
if(row.auditStatus!="1"&&value != "未启动"){ |
|
|
|
return '<span class="badge badge-danger">' + value + '</span>'; |
|
|
@ -308,7 +308,6 @@ |
|
|
|
{title: '当前任务ID',field: 'taskId',visible: false}, |
|
|
|
{ title: '待办用户ID',field: 'todoUserId', visible: false}, |
|
|
|
{ title: '当前任务名称',field: 'taskName',visible: false, |
|
|
|
align: 'center', |
|
|
|
formatter: function(value, row, index) { |
|
|
|
return '<span class="badge badge-primary">' + value + '</span>'; |
|
|
|
} |
|
|
@ -451,7 +450,7 @@ |
|
|
|
// 检查是否已审核 |
|
|
|
if (row.auditStatus === AUDIT_STATUS_APPROVED) { |
|
|
|
// 使用 $.modal.confirm 显示确认对话框 |
|
|
|
$.modal.confirm("确定导出这条数据的出货单吗?", function() { |
|
|
|
$.modal.confirm("确定导出这条数据的销售单吗?", function() { |
|
|
|
// 如果用户点击确定,继续导出 |
|
|
|
var salesOrderCode = row.salesOrderCode; |
|
|
|
window.location.href = prefix + "/exportSalesOrder/" + salesOrderCode; |
|
|
|