LY 离职逻辑修改

ui/src/views/training/training/trainingNon.vue

@@ -73,7 +73,7 @@
 
 <script>
 import { listTrainingNon, getTrainingNon, delTrainingNon, addTrainingNon, updateTrainingNon, exportTrainingNon, importTemplate} from "@/api/training/trainingNon";
-import { listStaffmgr, selectByStaffId } from "@/api/plant/staffmgr";
+import { listStaffmgr,listAllStaffmgr, selectByStaffId } from "@/api/plant/staffmgr";
 
 export default {
   name: "TrainingNon",
@@ -97,9 +97,12 @@ export default {
       staffmgrQueryParams: {
         staffid: null,
         unit: null,
-        actualposts: null
+        actualposts: null,
+        leftYear: null
+      },
+      trainingStaffQueryParams: {
+        leftYear: null
       },
-      trainingStaffQueryParams: {},
       // 培训计划未参加人员表格数据
       trainingNonList: [],
       //人员表联查
@@ -122,6 +125,8 @@ export default {
   methods: {
     init (row) {
       this.queryParams.trainingId = row.id || 0
+      this.staffmgrQueryParams.leftYear = row.year
+      this.trainingStaffQueryParams.leftYear = row.year
       this.staffmgrQueryParams.units = row.unitid
       this.staffmgrQueryParams.actualposts = row.positionid
       if (row.designatedStaff != null) {
@@ -134,7 +139,7 @@ export default {
     },
     //获取人员表
     getStaffmar() {
-      listStaffmgr(this.staffmgrQueryParams).then(response => {
+      listAllStaffmgr(this.staffmgrQueryParams).then(response => {
         this.stffmgrOptions = response.rows;
         if (this.designatedStaffs.length > 0) {
           selectByStaffId(this.designatedStaffs).then(response => {
@@ -142,7 +147,7 @@ export default {
           })
         }
       });
-      listStaffmgr(this.trainingStaffQueryParams).then(response => {
+      listAllStaffmgr(this.trainingStaffQueryParams).then(response => {
         this.trainingstaffOptions = response.rows;
       });
       this.$nextTick(() => {