diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html index 66e42ee9..f7e41cbd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html @@ -56,6 +56,7 @@ var editFlag = [[${@permission.hasPermi('system:apply:edit')}]]; var detailFlag = [[${@permission.hasPermi('system:apply:editFile')}]] var removeFlag = [[${@permission.hasPermi('system:apply:remove')}]]; + var applyState = [[${@dict.getType('sys_user_apply_status')}]]; var prefix = ctx + "system/applyList"; $(function() { var options = { @@ -107,6 +108,14 @@ field: 'smGrade', title: '涉密等级', }, + { + title: '状态', + align: 'center', + field: 'applyStatus', + formatter: function(value, row, index) { + return $.table.selectDictLabel(applyState, value); + } + }, { field: 'createTime', title: '创建时间', diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html index 088db73c..7361ac4e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html @@ -45,6 +45,7 @@