diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html index 9958c74d..7d40b791 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html @@ -45,7 +45,7 @@
@@ -167,7 +167,8 @@ title: '操作', align: 'center',formatter: function(value, row, index) { var actions = []; actions.push('详情 '); - return actions.join(''); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ] diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html index 175b546d..1c11c481 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html +++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html @@ -56,7 +56,7 @@ 添加 - + 导出 @@ -127,10 +127,11 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('详情 '); + actions.push('编辑 '); + actions.push('详情 '); - return actions.join(''); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } }] }; diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html index 9045e958..5c99baa7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html @@ -261,38 +261,38 @@ // actions.push('删除 '); //详情页面 工程审核为详情页面 // actions.push('详情 '); - actions.push('详情 '); + actions.push('详情 '); // 评审 if(row.makeStatus == '0'){ - actions.push('评审 '); + actions.push('评审 '); } // 部门主管确认 if(row.deptLeaderConfirmStatus == '0'){ - actions.push('确认时间 '); + actions.push('确认时间 '); } // 工程审核 if(row.makeStatus == '2'){ - actions.push('工程审核 '); + actions.push('工程审核 '); } // 采购审核:生产状态-待采购审核,采购上级确认状态-已确认 if(row.makeStatus == '7'&&row.purchaseStatus == '1'){ - actions.push('采购审核 '); + actions.push('采购审核 '); } // 领料 if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') && (row.eceiptStatus == '7' || row.eceiptStatus == '8')){ - actions.push('领料 '); + actions.push('领料 '); } // 委外计划 if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') && (row.eceiptStatus == '3' || row.eceiptStatus == '4'|| row.eceiptStatus == '5'|| row.eceiptStatus == '6'|| row.eceiptStatus == '7' || row.eceiptStatus == '8')){ - actions.push('委外计划 '); + actions.push('委外计划 '); } // 委内入库 对应生产中 if(row.makeStatus == '4' || row.makeStatus == '5'){ // actions.push('委内入库 '); - actions.push('生产入库 '); + actions.push('生产入库 '); } diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html index 99e41d68..6087ef72 100644 --- a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html +++ b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html @@ -52,12 +52,6 @@ 添加 - - - - - - @@ -104,10 +98,11 @@ {field: 'updateTime', title: '上次更新时间'}, {title: '操作',align: 'center',formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('详情 '); - actions.push('删除'); - return actions.join(''); + actions.push('编辑 '); + actions.push('详情 '); + actions.push('删除'); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ] diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html index 334de092..7eb2051e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html @@ -31,12 +31,6 @@ 添加 - - 修改 - - - 删除 - @@ -63,7 +57,6 @@ showColumns: false, fixedColumns: true, // 启用冻结列 fixedRightNumber: 1, // 冻结右列个数 - height: $(window).height() - 100, modalName: "制程类别明细", columns: [ {checkbox: true}, @@ -79,10 +72,11 @@ {field: 'updateTime',title: '上次更新时间'}, {title: '操作',align: 'center',formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('删除'); - actions.push('详情 '); - return actions.join(''); + actions.push('编辑 '); + actions.push('删除'); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ] diff --git a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html index 6c1cb0a2..aa8dd0e4 100644 --- a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html +++ b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html @@ -213,11 +213,12 @@ }, {title: '操作',align: 'center',formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('详情'); - actions.push('删除'); + actions.push('编辑 '); + actions.push('详情'); + actions.push('删除'); - return actions.join(''); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ]