From 1720b3914fa8a0b14b191ed4d6c1a2da703237ad Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Wed, 5 Jun 2024 11:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E6=8E=A5=E6=94=B6?=
=?UTF-8?q?=E7=AD=89=E6=8C=89=E9=92=AE=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/filedestory/filedestory.html | 9 +++-
.../system/fileextract/fileextract.html | 7 ++-
.../system/filereceive/filereceive.html | 7 ++-
.../templates/system/leave/leave.html | 17 ++++---
.../templates/system/train/train.html | 45 ++++++++++++++-----
5 files changed, 64 insertions(+), 21 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html b/ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html
index fe5ae9f..16e3dc7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html
+++ b/ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html
@@ -118,8 +118,13 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + detaileFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>详情</a> ');
- actions.push('<a class="btn btn-warning btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-remove"></i>销毁</a> ');
+ if (row.destoryState === '2'){
+ actions.push('<a class="btn btn-success btn-xs ' + detaileFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+ actions.push('<a class="btn btn-warning btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-remove"></i>销毁</a> ');
+ }else{
+ actions.push('<a class="btn btn-success btn-xs ' + detaileFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+ actions.push('<a disabled class="btn btn-warning btn-xs ' + removeFlag + '" href="javascript:void(0)"><i class="fa fa-remove"></i>销毁</a> ');
+ }
return actions.join('');
}
}]
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html b/ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html
index 3065b49..01b0b63 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html
@@ -113,7 +113,12 @@
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.receiveId + '\')"><i class="fa fa-edit"></i>提取</a> ');
+ if (row.extractState === '2'){
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>提取</a> ');
+ }else{
+ actions.push('<a disabled class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-edit"></i>提取</a> ');
+ }
+
//actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.receiveId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
index 2403a48..193bfbc 100644
--- a/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
+++ b/ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html
@@ -113,7 +113,12 @@
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.receiveId + '\')"><i class="fa fa-edit"></i>接收</a> ');
+ if (row.receiveState === '2'){
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.receiveId + '\')"><i class="fa fa-edit"></i>接收</a> ');
+ }else{
+ actions.push('<a disabled class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-edit"></i>接收</a> ');
+ }
+
//actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.receiveId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
index 24ff850..45e6e6d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
@@ -146,10 +146,17 @@
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.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="leaveAuditing(\'' + row.id + '\')"><i class="fa fa-edit"></i>审核</a> ');
- actions.push('<a class="btn btn-success btn-xs ' + PrintFlag + '" href="javascript:void(0)" onclick="auditingPrint(\'' + row.id + '/' + row.userId + '\')"><i class="fa fa-download"></i>打印</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+ if (row.examinestate === '2'){
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="leaveAuditing(\'' + row.id + '\')"><i class="fa fa-edit"></i>审核</a> ');
+ actions.push('<a class="btn btn-success btn-xs ' + PrintFlag + '" href="javascript:void(0)" onclick="auditingPrint(\'' + row.id + '/' + row.userId + '\')"><i class="fa fa-download"></i>打印</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+ }else{
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a disabled class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)"><i class="fa fa-edit"></i>审核</a> ');
+ actions.push('<a class="btn btn-success btn-xs ' + PrintFlag + '" href="javascript:void(0)" onclick="auditingPrint(\'' + row.id + '/' + row.userId + '\')"><i class="fa fa-download"></i>打印</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+ }
return actions.join('');
}
}]
@@ -166,4 +173,4 @@
}
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/train.html b/ruoyi-admin/src/main/resources/templates/system/train/train.html
index a99864a..4bb2ce0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/train.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/train.html
@@ -73,7 +73,15 @@
var trainSubjectDatas = [[${@dict.getType('sys_usertrain_obj')}]];
var trainStateDatas = [[${@dict.getType('sys_examine_state')}]];
var prefix = ctx + "system/train";
-
+ let datas = []
+ $.ajax({
+ url: ctx + "system/area/getAllList",
+ type: 'GET',
+ data:{parentId:''} ,
+ success:((res)=>{
+ datas = res.data
+ }) ,
+ });
$(function() {
var options = {
url: prefix + "/list",
@@ -92,9 +100,12 @@
visible: false
},
{
- field: 'AREAID',
+ field: 'areaid',
title: '所属地市',
- visible: false
+ visible: false,
+ formatter: function(value, row, index) {
+ return getCity(datas, value)
+ }
},
{
@@ -102,12 +113,15 @@
title: '培训人员'
},
{
- field: 'FRAMEWORK',
+ field: 'framework',
title: '所属区县',
- visible: false
+ visible: false,
+ formatter: function(value, row, index) {
+ return getCity(datas, value)
+ }
},
{
- field: 'USERNAME',
+ field: 'username',
title: '人员名称',
visible: false
},
@@ -179,12 +193,12 @@
}
},
{
- field: 'PART',
+ field: 'part',
title: '部门',
visible: false
},
{
- field: 'TRAININFO',
+ field: 'traininfo',
title: '培训评价',//
visible: false
},
@@ -193,10 +207,17 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)" onclick="examine(\'' + row.id + '\')"><i class="fa fa-edit"></i>审核</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+ if (row.trainState === 2){
+ actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)" onclick="examine(\'' + row.id + '\')"><i class="fa fa-edit"></i>审核</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+ }else{
+ actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a> ');
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a disabled class="btn btn-success btn-xs ' + examineFlag + '" href="javascript:void(0)"><i class="fa fa-edit"></i>审核</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+ }
return actions.join('');
}
}]