Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/store/index.js

@@ -6,6 +6,7 @@ import user from './modules/user'
 import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
+import tabActive from './modules/tabActive'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -17,7 +18,8 @@ const store = new Vuex.Store({
     user,
     tagsView,
     permission,
-    settings
+    settings,
+    tabActive
   },
   getters
 })

src/store/modules/tabActive.js

@@ -0,0 +1,20 @@
+const state = {
+    menuActive: 0,
+}
+const mutations = {
+    SET_MENU_ACTIVE: (state, menuActive) => {
+        state.menuActive = menuActive
+    }
+}
+
+const actions = {
+  
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+

src/views/collect/CollectOrderTabs.vue

@@ -439,6 +439,7 @@ export default {
         // 如果找到了，执行一些操作
         this.menuActive = foundTab.number
         this.$set(this.resetKeys, foundTab.name, Date.now());
+        this.$store.commit('tabActive/SET_MENU_ACTIVE', foundTab.number);
       }
     },
     clickMenuItem(val) {
@@ -450,6 +451,7 @@ export default {
         this.editableTabsValue = foundTab.name
         this.$set(this.resetKeys, foundTab.name, Date.now());
         this.menuActive = foundTab.number
+        this.$store.commit('tabActive/SET_MENU_ACTIVE', foundTab.number);
       } else {
         // 如果没有找到，执行其他操作
         this.addTab(item)
@@ -473,6 +475,7 @@ export default {
       this.editableTabs.push(item)
       this.editableTabsValue = item.name
       this.menuActive = item.number
+      this.$store.commit('tabActive/SET_MENU_ACTIVE', item.number);
     },
     removeTab(targetName) {
       let tabs = this.editableTabs
@@ -485,6 +488,7 @@ export default {
             if (nextTab) {
               activeName = nextTab.name
               this.menuActive = nextTab.number
+              this.$store.commit('tabActive/SET_MENU_ACTIVE', nextTab.number);
             }
           }
         })

src/views/collect/DealOrder.vue

@@ -1069,11 +1069,11 @@ export default {
     //环境判断
     if(window.navigator.userAgent.indexOf("GLXP_PC") != -1){
       this.scanDisabled = true;
-      window.addEventListener('recCodes', this.handleRecCodesEvent);
+      window.addEventListener('djcl', this.handleRecCodesEvent);
     }
   },
   unmounted() {
-    window.removeEventListener('recCodes', this.handleRecCodesEvent);
+    window.removeEventListener('djcl', this.handleRecCodesEvent);
   },
   created() {
     getHead("prescribeTagCodeDeal", "1").then((re) => {

src/views/collect/IoCreateOrder.vue

@@ -1916,11 +1916,11 @@ export default {
     //环境判断
     if(window.navigator.userAgent.indexOf("GLXP_PC") != -1){
       this.scanDisabled = true;
-      window.addEventListener('recCodes', this.handleRecCodesEvent);
+      window.addEventListener('gwsh', this.handleRecCodesEvent);
     }
   },
   unmounted() {
-    window.removeEventListener('recCodes', this.handleRecCodesEvent);
+    window.removeEventListener('gwsh', this.handleRecCodesEvent);
   },
   created() {
     // this.splitType = this.$route.query.splitType;

src/winExtend.js

@@ -1,15 +1,34 @@
+import store from "./store";
 //扩展window函数
 window.recCodes =  function recCodes(codes) {
     if(codes){
         if (!Array.isArray(codes) || codes.some(item => typeof item!== 'string')) {
             throw new Error('codes 参数必须是一个字符串数组');
         }
-        // 触发自定义事件
+        // console.log("菜单触发事件",store.state.tabActive.menuActive);
-        window.dispatchEvent(new CustomEvent('recCodes', {
+        //触发自定义事件
-            detail: {
+        let menuActive = store.state.tabActive.menuActive;
-               recCodes: codes
+        if(menuActive == 0){//处理单据
-            }
+            window.dispatchEvent(new CustomEvent('djcl', {
-        }));
+                detail: {
+                   menuNumber:menuActive,
+                   menuName:"处理单据",
+                   tyepEvent:'djcl',
+                   recCodes: codes
+                }
+            }));
+        }else if(menuActive == 1){//工位上货
+            window.dispatchEvent(new CustomEvent('gwsh', {
+                detail: {
+                   menuNumber:menuActive,
+                   menuName:"工位上货",
+                   tyepEvent:'gwsh',
+                   recCodes: codes
+                }
+            }));
+        }else{
+
+        }
     }else{
         alert("收到空数据");
     }