diff --git a/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue b/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
index 222f746..846c331 100644
--- a/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
+++ b/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
@@ -1,5 +1,5 @@
 <template>
-  <VxeGrid v-bind="gridOptions" @cell-click="cellClick" @checkbox-change="checkboxChange" @checkbox-all="checkboxAll" />
+  <VxeGrid ref="pwfkRef" v-bind="gridOptions" @cell-click="cellClick" @checkbox-change="checkboxChange" @checkbox-all="checkboxAll" />
 </template>
 
 <script>
@@ -41,6 +41,16 @@ export default {
     this.gridOptions.columns=columns
   },
   sockets:{
+    pwComplete(data){
+      console.log(data)
+      const selected=this.$refs.pwfkRef.getCheckboxRecords();
+      for (const item of selected) {
+        if (item.dcCh===data.czbh&&item.dcPl===data.pl&&item.tzbh===data.tlth){
+          this.$refs.pwfkRef.remove(item)
+          break;
+        }
+      }
+    },
     zyjhzx(data){
       console.log(data)
       if (this.deviceId!==data.msg.deviceId&&data.msg.actionType!=='开始报工'){
@@ -117,7 +127,7 @@ export default {
       }).then(res=>{
         if (res.success){
           window.localStorage.removeItem('zyjh')
-          this.initData(this.$props.worker().userCode,'31')
+          //this.initData(this.$props.worker().userCode,'31')
         }
       })
     },
@@ -145,7 +155,7 @@ export default {
         }).then(res=>{
           if (res.success){
             window.localStorage.removeItem('zyjh')
-            this.initData(this.$props.worker().userCode,'31')
+            //this.initData(this.$props.worker().userCode,'31')
           }
         })
       })
@@ -153,7 +163,7 @@ export default {
     initData(worker,zt){
       this.gridOptions.ycldw=this.$props.dw
       getForemanByWorker({worker:worker}).then(res=>{
-        getYdjhByZtOrForeman({foreman:res.data.userCode,zt:zt,field:'pwpgry'}).then(res=>{
+        getYdjhByZtOrForeman({foreman:res.data?.userCode,zt:zt,field:'pwpgry'}).then(res=>{
           this.list=res.data
           this.gridOptions.data=res.data
           this.setExt('workers',this.$props.workers)
diff --git a/src/views/zyjhzx/pwanfkui/comps/pgdTable.js b/src/views/zyjhzx/pwanfkui/comps/pgdTable.js
index 5b13406..0be2a22 100644
--- a/src/views/zyjhzx/pwanfkui/comps/pgdTable.js
+++ b/src/views/zyjhzx/pwanfkui/comps/pgdTable.js
@@ -73,8 +73,8 @@ export default function () {
     {field: 'wpxh', title: '规格', width: 70},
     {field: 'sllph', title: '炉批号', width: 100},
     {field: 'tzbh', title: '套料图号', width: 100},
-    {field: 'pwry', title: '接收人', width: 80,formatter:nameFormat},
-    {field: 'pwpgrq', title: '接收时间', width: 100},
+    // {field: 'pwry', title: '接收人', width: 80,formatter:nameFormat},
+    // {field: 'pwpgrq', title: '接收时间', width: 100},
     {field: 'pwfkry', title: '报工人', width: 80,formatter:nameFormat},
     {field: 'pwfkrq', title: '报工时间', width: 100},
     {field: 'pgr', title: '派工人', width: 80},