审核、接收等按钮进行修改

ruoyi-admin/src/main/resources/templates/system/filedestory/filedestory.html

@@ -118,8 +118,13 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        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('');
                     }
                 }]

ruoyi-admin/src/main/resources/templates/system/fileextract/fileextract.html

@@ -113,7 +113,12 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        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('');
                     }

ruoyi-admin/src/main/resources/templates/system/filereceive/filereceive.html

@@ -113,7 +113,12 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        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('');
                     }

ruoyi-admin/src/main/resources/templates/system/leave/leave.html

@@ -146,10 +146,17 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        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('');
                     }
                 }]

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 = [];
+                        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('');
                     }
                 }]