2/24 数据传递1.0

src/eventBus.js

@@ -0,0 +1,2 @@
+import Vue from 'vue';
+export const EventBus = new Vue();

src/views/collect/CollectOrderTabs.vue

@@ -304,6 +304,7 @@ import {
   getWorkBindBusTypes,
   removeBusTypeById
 } from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { EventBus } from '@/eventBus'
 
 export default {
   components: {
@@ -475,7 +476,9 @@ export default {
           name: 'IoSplitFifoRemove',
           component: IoSplitFifoRemove,
           // 假设你需要传递的参数
-          componentProps: {}
+          componentProps: {
+            message : ""
+          }
         },
         ],
       editableTabs: [{
@@ -494,7 +497,8 @@ export default {
       autoTag: 0,
       inAndOutType: 0,
       workPlaceClass: 1,
-      resetKeys: {}
+      resetKeys: {},
+      sendData: '',
     }
   },
   methods: {
@@ -604,6 +608,9 @@ export default {
     clickMenuItem(val) {
       //分两种 一种已存在 一种未存在
       let item = this.componentTables[(val)]
+      if (val == 13){
+        item.componentProps.message = this.sendData
+      }
       const foundTab = this.findTabByName(item.name)
       if (foundTab) {
         // 如果找到了，执行一些操作
@@ -611,6 +618,10 @@ export default {
         this.$set(this.resetKeys, foundTab.name, Date.now());
         this.menuActive = foundTab.number
         this.$store.commit('tabActive/SET_MENU_ACTIVE', foundTab.number);
+        // 将消息传递给 foundTab
+        if (val == 13){
+          EventBus.$emit('sendData', { message: this.sendData });
+        }
       } else {
         // 如果没有找到，执行其他操作
         this.addTab(item)
@@ -804,6 +815,14 @@ export default {
         })
       }
     }
+  },
+  mounted() {
+    EventBus.$on('update-data', (data) => {
+      this.sendData = data.message
+    });
+  },
+  beforeDestroy() {
+    EventBus.$off('update-data');
   }
 }
 </script>

src/views/collect/ConfirmDrugDealOrder.vue

@@ -279,7 +279,7 @@
           >
             <!--colorStyle(formData.ledNum)-->
             <!--<el-tag  style="color:red ">灯组信息</el-tag>-->
-            <el-tag  :type="colorStyle(formData.ledNum)">{{ledName}}</el-tag>
+            <el-tag  :type="colorStyle(formData.ledNum)" v-if="formData.ledNum != null">{{ledName}}</el-tag>
           </el-descriptions-item>
         </el-descriptions>
 
@@ -524,7 +524,7 @@ export default {
         busType: null,
         workPlaceCode: null,
         fromCorp: null,
-        confirmFinish: false
+        confirmFinish: false,
       },
       selectPrescriptionVisible: false,
       corpOrderIdDisabled: false,
@@ -644,6 +644,9 @@ export default {
         if (res.code == 20000) {
           if (res.data.billNo != null) {
             this.formData = res.data
+            if (this.formData.ledNum == null){
+              this.formData.ledNum = 5
+            }
             this.scanCode = ''
             this.formData.workPlaceCode = this.workplaceId
             this.checked = false
@@ -1160,6 +1163,9 @@ export default {
           } else if (temp.tagStatus === 2 || temp.tagStatus === 1) {
 
             this.formData = temp
+            if (this.formData.ledNum == null){
+              this.formData.ledNum = 5
+            }
             // this.ledNum = temp.ledNum
             this.panelALive = true
             this.startDeal()

src/views/collect/IoCreateOrder.vue

@@ -360,6 +360,8 @@ import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
 import {getByCode} from "@/api/basic/workPlace/SysWorkplaceQueue";
 import { getCodeList } from '@/api/inout/splitInv'
 import { getSet } from '@/api/collect/collectSet'
+import { EventBus } from '@/eventBus'
+
 
 // 常量定义
 const SCAN_TIMEOUT = 1000
@@ -643,7 +645,8 @@ export default {
       productName: null,
       orderStatus: false,//是否调用子组件
       workPlaceQueueCode:"",
-      collectSet: {}
+      collectSet: {},
+      sharedData: ''
     }
   },
   components: {
@@ -1584,6 +1587,8 @@ export default {
         })
       }
       this.$refs.inputRef.focus()
+      this.sharedData = 'over'
+      EventBus.$emit('update-data', { message: this.sharedData });
     },
     //选择单据
     selectPrescribe() {
@@ -2042,6 +2047,10 @@ export default {
             this.orderFormData.workPlaceQueueCode = this.curQueue.code
             this.scanCode = '';
             this.redMesg = false
+            //发送信息
+            // 发送事件并传递数据
+            this.sharedData = this.curQueue.code
+            EventBus.$emit('update-data', { message: this.sharedData });
             // //查找当前用户工位是否有正在处理的单据
             this.getOrder()
           } else {
@@ -2447,6 +2456,39 @@ export default {
       } else {
         console.error("WebSocket is not connected.");
       }
+    },
+    handleData(data){
+      let query = {
+        code : data,
+        workPlaceIdFk : this.workplaceId
+      }
+      getByCode(query).then((response) => {
+        this.loading = false;
+        if (response.code == 20000) {
+          this.curQueue = response.data;
+          this.productName = this.curQueue.cpmctymc
+          if (isBlank(this.productName)) {
+            this.curQueueName = "当前取货槽:" + this.curQueue.code
+          } else {
+            this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")"
+          }
+          this.orderFormData.workPlaceQueueCode = this.curQueue.code
+          this.scanCode = '';
+          this.redMesg = false
+          //发送信息
+          // 发送事件并传递数据
+          this.sharedData = this.curQueue.code
+          EventBus.$emit('update-data', { message: this.sharedData });
+          // //查找当前用户工位是否有正在处理的单据
+          this.getOrder()
+        } else {
+          this.scanCode = ''
+          this.$message.error(response.message)
+        }
+      }).catch(() => {
+
+      })
+      return true
     }
   },
   filters: {},
@@ -2485,6 +2527,10 @@ export default {
     document.addEventListener('visibilitychange', this.handleVisibilityChange)
     this.handleVisibilityChange()
 
+    EventBus.$on('sendCreateData', (data) => {
+      console.log("上货页面接受数据",data.message)
+      this.handleData(data.message)
+    });
   },
   beforeDestroy() {
     window.removeEventListener('gwsh', this.handleRecCodesEvent)
@@ -2493,6 +2539,7 @@ export default {
       console.log('工位上货Connection closed.')
     }
     document.removeEventListener('visibilitychange', this.handleVisibilityChange)
+    EventBus.$off('sendCreateData');
   },
   created() {
     // this.splitType = this.$route.query.splitType;

src/views/collect/IoSplitFifoRemove.vue

@@ -20,7 +20,8 @@
 <!--        </el-row>-->
 
         <el-button-group
-          style="display: flex; margin-top: 5px; float: right"
+          style="display: flex; margin-top: 5px; justify-content: flex-end;"
+
         >
           <el-button size="mini" type="primary" @click.native="paizhao()"
                      v-if="collectSet != null && collectSet.autoDecode == 0"
@@ -294,6 +295,7 @@ import {splitFifoDetail} from '@/api/inout/splitCode'
 import {batchAddCode, batchVailCode, enterCodeWeb} from '@/api/inout/order'
 import {getSet} from '@/api/collect/collectSet'
 import A from '@/plugins/KeyScaner'
+import { EventBus } from '@/eventBus'; // 引入事件总线
 
 const SLOT_CODE_PREFIX = 'DMQ'
 
@@ -303,7 +305,13 @@ export default {
     resetKey: {
       type: Function,
       required: true
-    }
+    },
+    message: {
+      type: String,
+      default: '',
+      required: false
+    },
+
   },
   watch: {
     resetKey(newVal, oldVal) {
@@ -417,6 +425,7 @@ export default {
           this.isSuccess = true
           this.deleteCode()
           this.init()
+
         } else {
           if (response.code == 502) {
             this.checkSuccess = false
@@ -484,6 +493,10 @@ export default {
           this.getSplitCodes()
           this.init()
           //扫码结果
+          console.log("shanchu wan ma",this.message)
+          if (!isBlank(this.message)){
+            EventBus.$emit('sendCreateData', { message: this.message });
+          }
         } else {
           //追溯码不存在
           let printData = [
@@ -711,8 +724,9 @@ export default {
     },
     dropCode() {
       this.redMeg = true
-      this.curQueueName = '',
+      this.curQueueName = ''
         this.isCheckQueue = false
+      this.curProductData = ''
       this.curQueue = null
       this.queueCodes = []
       this.splitCodes = []
@@ -730,7 +744,7 @@ export default {
       this.splitCodeTotal = 0
       this.queueCodeTotal = 0
       this.collectSet = null
-
+      this.alertInit()
     },
     paizhao() {
       if (this.ws && this.ws.readyState === WebSocket.OPEN) {
@@ -881,6 +895,19 @@ export default {
           console.log('关闭工位剔除websocket成功')
         }
       }
+    },
+    handleData(data) {
+      this.message = data
+      // 更新数据
+      if (!isBlank(data)){
+        if (data == 'over'){
+          this.dropCode()
+          return;
+        }
+        this.scanCode = data;
+        this.workplaceId = this.$route.query.workplaceId
+        this.handleSlotCodeScan()
+      }
     }
   },
   computed: {
@@ -948,10 +975,18 @@ export default {
     document.addEventListener('visibilitychange', this.handleVisibilityChange)
     this.handleVisibilityChange()
 
+    EventBus.$on('sendData', (data) => {
+      this.handleData(data.message)
+    });
   },
   created() {
     this.workplaceId = this.$route.query.workplaceId
     // this.selectSysParam()
+    if (!isBlank(this.message)){
+      this.scanCode = this.message
+      this.handleSlotCodeScan()
+    }
+
   },
   beforeDestroy() {
     window.removeEventListener('gwsh', this.handleRecCodesEvent)
@@ -960,6 +995,7 @@ export default {
       console.log('工位剔除Connection closed.')
     }
     document.removeEventListener('visibilitychange', this.handleVisibilityChange)
+    EventBus.$off('sendData');
   }
 }
 </script>