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

[fix]工程管理 

开发修改单前端列表页面操作栏和表头按钮调整为统一样式
dev
liuxiaoxu 2 months ago
parent
3d544f3125
commit
1dbf4b8388
1 changed files with 9 additions and 8 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. 17
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

17
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
View File

@ -65,7 +65,7 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:developModifyOrder:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:developModifyOrder:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="erp:developModifyOrder:export"> <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="erp:developModifyOrder:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -245,9 +245,9 @@
// 审核状态-审核通过 // 审核状态-审核通过
if(row.auditStatus=="1"){ if(row.auditStatus=="1"){
// 编辑 // 编辑
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
if (row.purchaseStorageStatus == 7 || row.purchaseStorageStatus == 8){ if (row.purchaseStorageStatus == 7 || row.purchaseStorageStatus == 8){
actions.push('<a class="btn btn-success btn-xs ' + pickAddFlag + '" href="javascript:void(0)" onclick="pickAdd(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>领料</a> '); actions.push('<a class=" ' + pickAddFlag + '" href="javascript:void(0)" onclick="pickAdd(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>领料</a> ');
} }
} }
@ -258,17 +258,18 @@
var todoUserIdList = row.todoUserId.split(","); var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName) || loginName == 'admin'){ if(todoUserIdList.includes(loginName) || loginName == 'admin'){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> '); actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
} }
} }
// 审批历史 // 审批历史
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> '); actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
// 进度查看 // 进度查看
actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> '); actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
} }
// 详情 // 详情
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>详情</a> '); actions.push('<a href="javascript:void(0)" onclick="detail(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

Write Preview
Loading…
Cancel
Save