Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/layouts/page/index.vue

@@ -54,7 +54,6 @@
       const openCache = computed(() => unref(getOpenKeepAlive) && unref(getShowMultipleTab))
 
       const getCaches = computed((): string[] => {
-        console.log(tabStore.getCachedTabList)
         // if (!unref(getOpenKeepAlive)) {
         //   return []
         // }

src/views/bookingcabin/labelSet/index.vue

@@ -49,6 +49,9 @@ import Modal from './detail.vue'
 import { useModal } from '/@/components/Modal'
 import { formatParams } from '/@/hooks/web/common'
 import { useMessage } from '/@/hooks/web/useMessage'
+import { useRouter } from 'vue-router'
+const router = useRouter()
+console.log(router.getRoutes());
 const { createMessage } = useMessage()
 const [registerModal, { openModal }] = useModal()
 const [registerTable, { reload, setLoading, getPaginationRef, getSelectRows, setProps }] = useTable({

src/views/taskmanage/index.vue

@@ -247,8 +247,8 @@
         </a-modal>
     </div>
 </template>
-<script lang="ts" setup name="任务管理">
-import { ref, onMounted, watch } from 'vue'
+<script lang="ts" setup name="任务台账">
+import { ref, onMounted, watch,onActivated } from 'vue'
 import { formatParams } from '/@/hooks/web/common'
 import { searchFormSchema } from './columns'
 import { useOptionsStore } from '/@/store/modules/options'
@@ -258,6 +258,7 @@ import { useMessage } from '../../hooks/web/useMessage'
 import { useRoute, useRouter } from 'vue-router';
 const { createMessage } = useMessage()
 const route = useRoute();
+const router = useRouter();
 import {
     GetCurrentTotalStat, GetPageAsync, TaskManageTruckGetInfoByTaskId,
     TaskManageTruckPrintTemplateWithHistoryList,
@@ -302,11 +303,12 @@ onMounted(() => {
 })
 
 
-watch(() => route.fullPath, (val) => {
-    if (val === '/taskmanage') {
-        refshTotalStat()
-    }
-}, { deep: true });
+
+router.afterEach((to, from) => {
+  if (to.fullPath === '/taskmanage') {
+    refshTotalStat();
+  }
+});
 
 const levelreLoading = ref(false)
 const levelLoading = ref(false)
@@ -593,7 +595,6 @@ function handledbclick(row) {
     handleEdit(row)
 }
 
-const router = useRouter();
 function handleEdit(data) {
     switch (data.tasK_TYPE) {
         case 'VGM_COMPARE':