From cca60694a740a637494818fa7dbf59b154ce9e5a Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 26 Dec 2024 20:53:45 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E8=A1=A8=E5=A4=B4?=
=?UTF-8?q?=E5=92=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F?=
=?UTF-8?q?=E4=B8=80=E6=A0=B7=E5=BC=8F=20=E5=BC=80=E5=8F=91=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=8D=95=E9=A2=86=E6=96=99=E8=A1=A8=E5=A4=B4=E5=92=8C?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E4=BA=A7=E5=93=81=E5=9E=8B=E5=8F=B7?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=A4=B4=E5=92=8C?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=A0=8F=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../developModifyOrder/developModifyOrder.html | 2 ++
.../developModifyorderPicking.html | 15 ++++++++-------
.../resources/templates/system/model/model.html | 9 +++++----
3 files changed, 15 insertions(+), 11 deletions(-)
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);
}
}
]