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

[fix] 工程管理 

开发修改单表头和操作栏采用统一样式
开发修改单领料表头和操作栏采用统一样式
产品型号列表页面表头和操作栏采用统一样式
dev
liuxiaoxu 2 months ago
parent
6a9d700b58
commit
cca60694a7
3 changed files with 15 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
  2. 15
      ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html
  3. 9
      ruoyi-admin/src/main/resources/templates/system/model/model.html

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

@ -109,6 +109,8 @@
restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export",
modalName: "开发修改单",
fixedColumns: true, // 启用冻结列
fixedRightNumber: 1, // 冻结右列个数
columns: [
{checkbox: true},
{title: '开发修改单ID',field: 'developOrderId',visible: false},

15
ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html
View File

@ -45,7 +45,7 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="erp:developModifyorderPicking:export">
<a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="erp:developModifyorderPicking:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
@ -222,7 +222,7 @@
// 审核状态-审核通过
if(row.auditStatus=="1"){
// 编辑
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.developOrderPickingId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.developOrderPickingId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
}
// 有流程实例id
if (row.instanceId) {
@ -231,17 +231,18 @@
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName) || loginName == 'admin'){
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.developOrderPickingId + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join('');
actions.push('<a href="javascript:void(0)" onclick="detail(\'' + row.developOrderPickingId + '\')"><i class="fa fa-edit"></i>详情</a> ');
var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
}
}]
};

9
ruoyi-admin/src/main/resources/templates/system/model/model.html
View File

@ -55,7 +55,7 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:model:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:model:export">
<a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:model:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
@ -124,9 +124,10 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.pid + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join('');
actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.pid + '\')"><i class="fa fa-edit"></i>详情</a> ');
var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
}
}
]

Write Preview
Loading…
Cancel
Save