diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html index 0896c3fa..38635647 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html @@ -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}, diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html index 673a07d8..019212a0 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html @@ -45,7 +45,7 @@
@@ -222,7 +222,7 @@ // 审核状态-审核通过 if(row.auditStatus=="1"){ // 编辑 - actions.push('编辑 '); + actions.push('编辑 '); } // 有流程实例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(' '+nodeName+' '); + actions.push(' '+nodeName+' '); } } // 审批历史 - actions.push(' 审批历史 '); + actions.push(' 审批历史 '); // 进度查看 - actions.push(' 进度查看 '); + actions.push(' 进度查看 '); } // 详情 - actions.push('详情 '); - return actions.join(''); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/model/model.html b/ruoyi-admin/src/main/resources/templates/system/model/model.html index 171345e0..f0ec190b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/model/model.html +++ b/ruoyi-admin/src/main/resources/templates/system/model/model.html @@ -55,7 +55,7 @@ 添加 - + 导出 @@ -124,9 +124,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('详情 '); - return actions.join(''); + actions.push('编辑 '); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ]