diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue
index 5538c10..be8ae98 100644
--- a/src/views/jhzx/ydjhzxCX.vue
+++ b/src/views/jhzx/ydjhzxCX.vue
@@ -113,6 +113,8 @@ import { getToken } from '@/utils/auth'
 import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
 import {exportByExcel} from "@/utils/rpkj";
 import {editZyq} from "@/api/jhzxgl/ydjh";
+import {getBzryList} from "@/api/sjzx/bzzGL";
+import {groupBy} from "@/utils";
 export default {
   name:'YdjhzxCX',
   components: {ScrollPane},
@@ -433,16 +435,16 @@ export default {
         //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
         //   filterRender: { name: 'FilterCombination' }
         // },
-        {
-          field: 'slpgry',
-          title: '上料派工人',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
+        // {
+        //   field: 'slpgry',
+        //   title: '上料派工人',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
         {
           field: 'slfkry',
-          title: '上料反馈人',
+          title: '上料反馈人',formatter:this.formatWorker,
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -476,29 +478,29 @@ export default {
         //   filterRender: { name: 'FilterCombination' }
         // },
         {
-          field: 'pwpgry',
-          title: '抛丸派工人',
+          field: 'pwpgrq',
+          title: '抛丸派工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'pwpgrq',
-          title: '抛丸派工日期',
+          field: 'pwpgry',
+          title: '抛丸派工人',formatter:this.formatWorker,
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'pwfkry',
-          title: '抛丸反馈人',
+          field: 'pwfkrq',
+          title: '抛丸报工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'pwfkrq',
-          title: '抛丸报工日期',
+          field: 'pwfkry',
+          title: '抛丸反馈人',formatter:this.formatWorker,
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -581,15 +583,15 @@ export default {
         //   filterRender: { name: 'FilterCombination' }
         // },
         {
-          field: 'hxpgry',
-          title: '划线派工人',
+          field: 'hxpgrq',
+          title: '划线派工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'hxpgrq',
-          title: '划线派工日期',
+          field: 'hxpgry',
+          title: '划线派工人',formatter:this.formatWorker,
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -603,7 +605,7 @@ export default {
         },
         {
           field: 'hxfkry',
-          title: '划线报工人员',
+          title: '划线报工人员',formatter:this.formatWorker,
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -639,29 +641,29 @@ export default {
         //   filterRender: { name: 'FilterCombination' }
         // },
         {
-          field: 'qgpgry',
-          title: '切割派工人',
+          field: 'qgpgrq',
+          title: '切割派工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'qgpgrq',
-          title: '切割派工日期',
+          field: 'qgfkrq',
+          title: '切割报工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'qgfkry',
-          title: '切割报工人',
+          field: 'qgpgry',
+          title: '切割派工人',formatter:this.formatWorker,
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'qgfkrq',
-          title: '切割报工日期',
+          field: 'qgfkry',
+          title: '切割报工人',formatter:this.formatWorker,
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -716,6 +718,7 @@ export default {
         {label:'四区',value:'FP4Q'},
       ],
       tmpQuery:{dcCh:'',dcPl:''},
+      workers:{}
     }
   },
   computed: {
@@ -726,12 +729,24 @@ export default {
     this.getHeight()
     this.initBase()
     this.initgxList()
+    this.initWorkers()
   },
   methods: {
+    formatWorker({cellValue}){
+      return this.workers[cellValue]
+    },
+    initWorkers(){
+      getBzryList({}).then(res=>{
+        res.data?.forEach(item=>{
+          this.workers[item.userCode]=item.userName;
+        })
+        console.log(this.workers)
+      })
+    },
     //未完成悬浮提示
     showWarning({ type, column, row }){
       var err = '未完成';
-      var slxhthCount=row.slxhthCount;
+      var slxhthCount=row?.slxhthCount;
       if (type === 'body') {
       if (column.field === 'slCount'){
         if (row.slCount > '0' && row.slCount<slxhthCount) {