LY 离职逻辑修改

master/src/main/java/com/ruoyi/project/training/controller/TTrainingDeviceController.java

@@ -165,6 +165,9 @@ public class TTrainingDeviceController extends BaseController
                         }else {
                             deviceDate.add("-");
                         }
+                    }else {
+                        device.add("/");
+                        deviceDate.add("/");
                     }
                 }
             }

ui/src/views/training/trainingrecords/index.vue

@@ -980,9 +980,13 @@ export default {
       //     return this.changeColor(row[i])
       //   }
       // }
+      console.log(row[columnIndex])
       return this.changeColor(row[columnIndex])
     },
     changeColor (value) {
+      if (value == null) {
+        return 'companyNot'
+      }
       if (value.trim().startsWith('20')){
           return 'companyFinish'
       }
@@ -1042,14 +1046,16 @@ export default {
           });
         }
         this.transTitle = data;
-        deviceListParticipants(this.deviceParams).then(response => {
-          this.devicelevelListTemp = response;
-          this.devicelevelList = response
-          this.deviceTrainingLoad = false
-          this.$nextTick(() => {
-            this.$refs.deviceTable.doLayout(); // 解决表格错位
-          });
-        })
+        this.$nextTick(() => {
+          deviceListParticipants(this.deviceParams).then(response => {
+            this.devicelevelListTemp = response;
+            this.devicelevelList = response
+            this.deviceTrainingLoad = false
+            this.$nextTick(() => {
+              this.$refs.deviceTable.doLayout(); // 解决表格错位
+            });
+          })
+        });
       })
     },
      /** 查询部门下拉树结构 */
@@ -1237,7 +1243,14 @@ export default {
       this.tableShow = true
       this.deviceParams.year = this.getNowTime();
       this.$nextTick(() => {
-        this.getDeviceTraining();
+        deviceListParticipants(this.deviceParams).then(response => {
+          this.devicelevelListTemp = response;
+          this.devicelevelList = response
+          this.deviceTrainingLoad = false
+          this.$nextTick(() => {
+            this.$refs.deviceTable.doLayout(); // 解决表格错位
+          });
+        })
       });
       // setTimeout(() => {
       //   this.getDeviceTraining();