From 98b462a7d57463565e9efc3df4c331c2817ba705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Fri, 20 Dec 2024 11:36:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E6=9C=88=E5=BA=A6=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=AE=A1=E6=A0=B8=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=202.=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/zyjhzx/components/TipsComp.vue      |  8 ++++++++
 src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue | 11 ++++++++++-
 .../zyjhzx/hxianpgong/comps/HxianPgd.vue      | 15 ++++++++++++++-
 src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue   | 10 ++++++++++
 src/views/zyjhzx/qgefkui/comps/QgePgd.vue     | 10 ++++++++++
 src/views/zyjhzx/qgepgong/comps/QgePgd.vue    | 13 +++++++++++++
 src/views/zyjhzx/sliao/index.vue              | 19 +++++++++++++------
 7 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/src/views/zyjhzx/components/TipsComp.vue b/src/views/zyjhzx/components/TipsComp.vue
index fc7b193..0fffce3 100644
--- a/src/views/zyjhzx/components/TipsComp.vue
+++ b/src/views/zyjhzx/components/TipsComp.vue
@@ -4,6 +4,7 @@
 
 <script>
 import * as Tips from './tips'
+import {EventBus} from "@/event-bus";
 
 export default {
   name: "TipsComp",
@@ -29,6 +30,9 @@ export default {
   },
   mounted(){
     this.initKonvaStage()
+    EventBus.$on('error', item => {
+      this.onMsg(item.msg)
+    })
   },
   created(){
     this.deviceId=this.$route.query.deviceId||''
@@ -46,6 +50,10 @@ export default {
       //   },10000)
       // }
       let msg
+      if (data.success&&data.data.deviceId===this.deviceId){
+        msg=`处理成功`
+      }
+
       if (data.code===3000&&data.msg.deviceId===this.deviceId){
         msg=`识别结果:${data.msg.orderNumber}`
       }
diff --git a/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue b/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue
index 6a91b25..2f08fb4 100644
--- a/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue
+++ b/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue
@@ -6,6 +6,7 @@
 import { VXETable } from 'vxe-table'
 import paoWanPgdConfig from './pgdTable'
 import {getDw, getForemanByWorker, getPgd, getPgd2, getYdjhByZtOrForeman, zx} from "@/api/zyjh";
+import {EventBus} from "@/event-bus";
 
 export default {
   name:'HxianPgd',
@@ -44,7 +45,7 @@ export default {
         this.$message.warning('短号有重复,请使用全工单号重新派工!!!')
         return
       }
-      console.log(this.list)
+      let errorFlag=true
       for (const item of this.list) {
         if (item.djh===data.msg.orderNumber||item.djh.slice(-djhWhLengh)===data.msg.orderNumber){
           const tmpArr=[{
@@ -53,9 +54,17 @@ export default {
             zt:item.zt
           }]
           this.baogong(tmpArr,item)
+          errorFlag=false
           break
         }
       }
+      if (errorFlag){
+        setTimeout(()=>{
+          EventBus.$emit('error', {
+            msg:'识别失败'
+          })
+        },3000)
+      }
     }
   },
   created(){
diff --git a/src/views/zyjhzx/hxianpgong/comps/HxianPgd.vue b/src/views/zyjhzx/hxianpgong/comps/HxianPgd.vue
index 7e74712..f81a42f 100644
--- a/src/views/zyjhzx/hxianpgong/comps/HxianPgd.vue
+++ b/src/views/zyjhzx/hxianpgong/comps/HxianPgd.vue
@@ -6,6 +6,7 @@
 import { VXETable } from 'vxe-table'
 import paoWanPgdConfig from './pgdTable'
 import {bgControl, getDw, getPgd, getPgd2, getYdjhByZt, pdfList, pgWithForeman, zx} from "@/api/zyjh";
+import {EventBus} from "@/event-bus";
 
 export default {
   name:'HxianPgd',
@@ -41,14 +42,23 @@ export default {
         this.$message.warning('短号有重复,请使用完整工单号重新派工!!!')
         return
       }
+      let errorFlag=true
       for (const item of this.list) {
         console.log(item.plxh?.slice(-djhWhLengh))
         if (item.plxh===data.msg.orderNumber||item.plxh?.slice(-djhWhLengh)===data.msg.orderNumber){
           console.log(item)
           this.paigong0(item)
+          errorFlag=false
           break
         }
       }
+      if (errorFlag){
+        setTimeout(()=>{
+          EventBus.$emit('error', {
+            msg:'识别失败'
+          })
+        },3000)
+      }
     }
   },
   created(){
@@ -126,7 +136,10 @@ export default {
         zt:'42'
       }
       const tmpArr=[data]
-      pgWithForeman(tmpArr).then(()=>{
+      pgWithForeman(tmpArr).then((res)=>{
+        if (res.success){
+          this.$message.success('处理成功')
+        }
         this.initData()
       })
     },
diff --git a/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue b/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
index 413dea9..222f746 100644
--- a/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
+++ b/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
@@ -6,6 +6,7 @@
 import { VXETable } from 'vxe-table'
 import paoWanPgdConfig from './pgdTable'
 import {getDw, getForeman, getForemanByWorker, getPgd, getYcldw, getYdjhByZtOrForeman, zx} from "@/api/zyjh";
+import {EventBus} from "@/event-bus";
 export default {
   name:'PwanPgd',
   props:{
@@ -54,6 +55,7 @@ export default {
         this.$message.warning('短号有重复,请使用全工单号重新派工!!!')
         return
       }
+      let errorFlag=true
       for (const item of this.list) {
         if (item.djh===data.msg.orderNumber||item.djh.slice(-djhWhLengh)===data.msg.orderNumber){
           const tmpArr=[{
@@ -62,9 +64,17 @@ export default {
             zt:item.zt
           }]
           this.baogong(tmpArr,item)
+          errorFlag=false
           break
         }
       }
+      if (errorFlag){
+        setTimeout(()=>{
+          EventBus.$emit('error', {
+            msg:'识别失败'
+          })
+        },3000)
+      }
     }
   },
   methods:{
diff --git a/src/views/zyjhzx/qgefkui/comps/QgePgd.vue b/src/views/zyjhzx/qgefkui/comps/QgePgd.vue
index 816912b..af1bff3 100644
--- a/src/views/zyjhzx/qgefkui/comps/QgePgd.vue
+++ b/src/views/zyjhzx/qgefkui/comps/QgePgd.vue
@@ -6,6 +6,7 @@
 import { VXETable } from 'vxe-table'
 import paoWanPgdConfig from './pgdTable'
 import {getDw, getForemanByWorker, getPgd, getPgd2, getYdjhByZtOrForeman, zx} from "@/api/zyjh";
+import {EventBus} from "@/event-bus";
 
 export default {
   name: 'QgePgd',
@@ -46,6 +47,7 @@ export default {
         this.$message.warning('短号有重复,请使用全工单号重新派工!!!')
         return
       }
+      let errorFlag=true
       for (const item of this.list) {
         if (item.djh===data.msg.orderNumber||item.djh.slice(-djhWhLengh)===data.msg.orderNumber){
           const tmpArr=[{
@@ -54,9 +56,17 @@ export default {
             zt:item.zt
           }]
           this.baogong(tmpArr,item)
+          errorFlag=false
           break
         }
       }
+      if (errorFlag){
+        setTimeout(()=>{
+          EventBus.$emit('error', {
+            msg:'识别失败'
+          })
+        },3000)
+      }
     }
   },
   created() {
diff --git a/src/views/zyjhzx/qgepgong/comps/QgePgd.vue b/src/views/zyjhzx/qgepgong/comps/QgePgd.vue
index ea07b1d..223ea8e 100644
--- a/src/views/zyjhzx/qgepgong/comps/QgePgd.vue
+++ b/src/views/zyjhzx/qgepgong/comps/QgePgd.vue
@@ -6,6 +6,7 @@
 import { VXETable } from 'vxe-table'
 import paoWanPgdConfig from './pgdTable'
 import {bgControl, getDw, getPgd, getPgd2, getYdjhByZt, pdfList, pgWithForeman, zx} from "@/api/zyjh";
+import {EventBus} from "@/event-bus";
 
 export default {
   name:'QgePgd',
@@ -41,12 +42,21 @@ export default {
         this.$message.warning('短号有重复,请使用完整工单号重新派工!!!')
         return
       }
+      let errorFlag=true
       for (const item of this.list) {
         if (item.plxh===data.msg.orderNumber||item.plxh?.slice(-djhWhLengh)===data.msg.orderNumber){
           this.paigong0(item)
+          errorFlag=false
           break
         }
       }
+      if (errorFlag){
+        setTimeout(()=>{
+          EventBus.$emit('error', {
+            msg:'识别失败'
+          })
+        },3000)
+      }
     }
   },
   created(){
@@ -148,6 +158,9 @@ export default {
       // }
       VXETable.modal.confirm('您确定派工吗？').then(res => {
         res === 'confirm' && pgWithForeman(tmpArr).then(res=>{
+          EventBus.$emit('error', {
+            msg:'处理成功'
+          })
           this.initData()
         })
       })
diff --git a/src/views/zyjhzx/sliao/index.vue b/src/views/zyjhzx/sliao/index.vue
index 19c94dc..a33951b 100644
--- a/src/views/zyjhzx/sliao/index.vue
+++ b/src/views/zyjhzx/sliao/index.vue
@@ -21,6 +21,7 @@ import {dict, getSljhPgd, getYcldw, shangLiao} from "@/api/zyjh";
 import {getBzryList} from "@/api/sjzx/bzzGL";
 import TipsComp from "@/views/zyjhzx/components/TipsComp.vue";
 import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
+import {EventBus} from "@/event-bus";
 
 export default {
   name:'SLiao',
@@ -66,7 +67,6 @@ export default {
   },
   sockets:{
     zyjhzx(data){
-
       if (this.deviceId!==data.msg.deviceId&&data.msg.actionType!=='开始报工'){
         return
       }
@@ -79,19 +79,17 @@ export default {
         this.$message.warning('短号有重复,请使用全工单号重新派工!!!')
         return
       }
-      console.log(this.currentDw,this.currentDwIndex)
       if(!this.currentDw||this.currentDwIndex===-1){
         this.$message.warning('请选择上料垛位')
         return;
       }
 
-      console.log(this.currentDw)
-
       const currentWorker=this.getCurrentWorker()
       if (!currentWorker){
         this.$message.warning('请选择报工人')
       }
       let index=-1
+      let errorFlag=true
       for (const item of this.list) {
         index+=1
         if (item.djh===data.msg.orderNumber||item.djh?.slice(-djhWhLengh)===data.msg.orderNumber){
@@ -117,15 +115,24 @@ export default {
             lph:item.sllph,
             nbsbm:item.nbsbm,
             bfr:currentWorker.userCode,
-            type:'YCL'
+            type:'YCL',
+            deviceId:this.deviceId
           }
           shangLiao(data).then(res=>{
             this.list.splice(index,1)
             this.drawSljhItem(this.list)
           })
+          errorFlag=false
           break
         }
       }
+      if (errorFlag){
+        setTimeout(()=>{
+          EventBus.$emit('error', {
+            msg:'识别失败'
+          })
+        },3000)
+      }
     }
   },
   methods:{
@@ -539,7 +546,7 @@ export default {
       const {group}=initSearch()
       this.layer.add(group)
 
-      //this.search(this.$refs.sliaoSearch.getQueryParam())
+      this.search(this.$refs.sliaoSearch.getQueryParam())
 
       const {layer:sljhLayer,group:sljhGroup}=sljh(this.width,this.height)
       this.sljhGroup=sljhGroup