Merge branch 'release' into dev

src/components/ProcessAudit/ZGSSPProcess.vue

@@ -21,7 +21,7 @@
 		<el-form :model="state.ruleForm" label-width="110px" ref="ruleFormRef" v-loading="state.loading">
 			<slot name="header"></slot>
 			<el-row :gutter="10">
-				<el-col>
+<!--				<el-col>
 					<el-form-item label="当前选择的流程">
 						{{ seatTopaidan ? '话务部到派单组' : '' }}
 						{{ seatToOrgOne ? '话务部到一级部门' : '' }}
@@ -37,7 +37,7 @@
 						{{ orgSummaryToEnd ? '部门汇总到归档' : '' }}
 						{{ orgToOrgLeader ? '部门到部门领导' : '' }}
 					</el-form-item>
-				</el-col>
+				</el-col>-->
 				<!-- 退回流程  -->
 				<template v-if="returnArr.includes(state.processType)">
 					<el-col v-if="isShowReturnSms">
@@ -683,7 +683,6 @@ import {
 } from '@/api/business/order';
 import { orderPrevious, workflowNextSteps, workflowNextStepsByOrder, workflowNextStepsByOrderInstead } from '@/api/system/workflow';
 import { useAppConfig } from '@/stores/appConfig';
-import { useThemeConfig } from '@/stores/themeConfig';
 import { VTreeDrop } from '@wsfe/vue-tree';
 import { removeDuplicate } from '@/utils/arrayOperation';
 

src/views/business/order/index.vue

@@ -370,7 +370,7 @@ import { exportOrder, listBaseData, orderList, orderListCount, orderListFixed }
 import { addObserve } from '@/api/query/observe';
 import { addEnd } from '@/api/query/end';
 import { treeArea } from '@/api/auxiliary/area';
-import { exportAssignment, getNeedArr } from '@/utils/tools';
+import { debounce, exportAssignment, getNeedArr } from '@/utils/tools';
 import Other from '@/utils/other';
 import mittBus from '@/utils/mitt';
 import { useThemeConfig } from '@/stores/themeConfig';
@@ -750,10 +750,13 @@ onMounted(() => {
 		getTotal();
 	});
 });
+const handleEvent = debounce(() => {
+	handleQuery();
+}, 1000);
 onActivated(() => {
 	mittBus.on('clearCachePage', () => {
 		//清除缓存
-		handleQuery();
+		handleEvent();
 	});
 });
 onBeforeUnmount(() => {

src/views/snapshot/statistics/allOrder/index.vue

@@ -539,13 +539,4 @@ onMounted(() => {
 		getBaseData();
 	});
 });
-onActivated(() => {
-	mittBus.on('clearCachePage', () => {
-		//清除缓存
-		handleQuery();
-	});
-});
-onBeforeUnmount(() => {
-	mittBus.off('clearCachePage');
-});
 </script>

src/views/tels/callLog/ybCallLog.vue

@@ -463,7 +463,7 @@
 import { defineAsyncComponent, onMounted, reactive, ref, onActivated, onBeforeUnmount, computed } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { downloadFileByStream } from '@/utils/tools';
+import { debounce, downloadFileByStream } from '@/utils/tools';
 import { callBaseData, callLogPaged, callLogTranscription, callLogPagedExport } from '@/api/tels/callLog';
 import { formatDate } from '@/utils/formatTime';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
@@ -769,10 +769,13 @@ onMounted(() => {
 		tableRef.value.connect(toolbarRef.value);
 	}
 });
+const handleEvent = debounce(() => {
+	handleQuery();
+}, 1000);
 onActivated(() => {
 	mittBus.on('clearCachePage', () => {
 		//清除缓存
-		handleQuery();
+		handleEvent();
 	});
 });
 onBeforeUnmount(() => {

src/views/tels/callLog/zgCallLog.vue

@@ -191,7 +191,7 @@
 import { defineAsyncComponent, onMounted, reactive, ref, onActivated, onBeforeUnmount } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { ElMessageBox } from 'element-plus';
-import { downloadFileBySrc, getNeedArr } from '@/utils/tools';
+import { debounce, downloadFileBySrc, getNeedArr } from '@/utils/tools';
 import { formatDate } from '@/utils/formatTime';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
 import { useRouter } from 'vue-router';
@@ -363,10 +363,13 @@ onMounted(() => {
 });
 const toolbarRef = ref<RefType>();
 const tableRef = ref<RefType>();
+const handleEvent = debounce(() => {
+	handleQuery();
+}, 1000);
 onActivated(() => {
 	mittBus.on('clearCachePage', () => {
 		//清除缓存
-		handleQuery();
+		handleEvent();
 	});
 });
 onBeforeUnmount(() => {

src/views/todo/center/index.vue

@@ -130,7 +130,7 @@ import { useRouter } from 'vue-router';
 import { formatDate } from '@/utils/formatTime';
 import { centerTodo, centerTodoBase } from '@/api/todo/center';
 import { orderAverage, orderSign } from '@/api/todo/order';
-import { exportAssignment } from '@/utils/tools';
+import { debounce, exportAssignment } from '@/utils/tools';
 import mittBus from '@/utils/mitt';
 
 // 引入组件
@@ -437,10 +437,13 @@ onMounted(() => {
 		getBaseData();
 	});
 });
+const handleEvent = debounce(() => {
+	handleQuery();
+}, 1000);
 onActivated(() => {
 	mittBus.on('clearCachePage', () => {
 		//清除缓存
-		handleQuery();
+		handleEvent();
 	});
 });
 onBeforeUnmount(() => {

src/views/todo/edit/index.vue

@@ -504,13 +504,4 @@ onMounted(() => {
 		getTotal();
 	});
 });
-onActivated(() => {
-	mittBus.on('clearCachePage', () => {
-		//清除缓存
-		handleQuery();
-	});
-});
-onBeforeUnmount(() => {
-	mittBus.off('clearCachePage');
-});
 </script>

src/views/todo/order/index.vue

@@ -161,7 +161,7 @@
 import { defineAsyncComponent, onMounted, reactive, ref, onActivated, onBeforeUnmount, computed } from 'vue';
 import { ElMessage, ElMessageBox, ElNotification, FormInstance } from 'element-plus';
 import { orderAverage, orderBatchArchive, orderListTodo, orderListTodoBase, orderListTodoTotal } from '@/api/todo/order';
-import { exportAssignment } from '@/utils/tools';
+import { debounce, exportAssignment } from '@/utils/tools';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
 import Other from '@/utils/other';
 import mittBus from '@/utils/mitt';
@@ -465,10 +465,13 @@ onMounted(() => {
 		getTotal();
 	});
 });
+const handleEvent = debounce(() => {
+	handleQuery();
+}, 1000);
 onActivated(() => {
 	mittBus.on('clearCachePage', () => {
 		//清除缓存
-		handleQuery();
+		handleEvent();
 	});
 });
 onBeforeUnmount(() => {

src/views/todo/seats/accept/lzAccept.vue

@@ -1069,8 +1069,7 @@ const chooseAdvice = (item: any) => {
 };
 // 取消并关闭当前页
 const onCancel = () => {
-	mittBus.emit('clearCache', 'todoSeats');
-	mittBus.emit('clearCachePage', ['order', 'todoOrder', 'todoCenter', 'callLog']);
+	mittBus.emit('clearCachePage', ['order', 'todoOrder', 'todoCenter', 'callLog','todoSeats']);
 	// 关闭当前 tagsView
 	if (state.ruleForm.callId) {
 		const currentRoute = state.tagsViewList.find((v: any) => v.query?.callId === state.ruleForm.callId);

src/views/todo/seats/accept/ybAccept.vue

@@ -1123,8 +1123,7 @@ const chooseAdvice = (item: any) => {
 };
 // 取消并关闭当前页
 const onCancel = () => {
-	mittBus.emit('clearCache', 'todoSeats');
-	mittBus.emit('clearCachePage', ['order', 'todoOrder', 'todoCenter', 'callLog']);
+	mittBus.emit('clearCachePage', ['order', 'todoOrder', 'todoCenter', 'callLog','todoSeats']);
 	// 关闭当前 tagsView
 	if (state.ruleForm.callId) {
 		const currentRoute = state.tagsViewList.find((v: any) => v.query?.callId === state.ruleForm.callId);

src/views/todo/seats/accept/zgAccept.vue

@@ -1124,8 +1124,7 @@ const chooseAdvice = (item: any) => {
 };
 // 取消并关闭当前页
 const onCancel = () => {
-	mittBus.emit('clearCache', 'todoSeats');
-	mittBus.emit('clearCachePage', ['order', 'todoOrder', 'todoCenter', 'callLog']);
+	mittBus.emit('clearCachePage', ['order', 'todoOrder', 'todoCenter', 'callLog','todoSeats']);
 	// 关闭当前 tagsView
 	if (state.ruleForm.callId) {
 		const currentRoute = state.tagsViewList.find((v: any) => v.query?.callId === state.ruleForm.callId);

src/views/todo/seats/index.vue

@@ -129,11 +129,11 @@
 	</div>
 </template>
 <script setup lang="tsx" name="todoSeats">
-import { computed, defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import { computed, defineAsyncComponent, onActivated, onBeforeUnmount, onDeactivated, onMounted, reactive, ref } from 'vue';
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
 import { useRouter } from 'vue-router';
 import { seatsListTodo, orderSign, orderListTodoCount } from '@/api/todo/order';
-import { exportAssignment } from '@/utils/tools';
+import { debounce, exportAssignment } from '@/utils/tools';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
 import Other from '@/utils/other';
 import { treeArea } from '@/api/auxiliary/area';
@@ -141,6 +141,7 @@ import { centerTodoBase } from '@/api/todo/center';
 import { LZTableHeader, YBTableHeader, ZGTableHeader } from '@/views/todo/seats/tableHeader';
 import { useThemeConfig } from '@/stores/themeConfig';
 import { storeToRefs } from 'pinia';
+import mittBus from '@/utils/mitt';
 // 引入组件
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
@@ -369,4 +370,15 @@ onMounted(() => {
 		getTotal();
 	});
 });
+const handleEvent = debounce(() => {
+	handleQuery();
+}, 1000);
+onActivated(() => {
+	mittBus.on('clearCachePage', () => {
+		handleEvent();
+	});
+});
+onBeforeUnmount(() => {
+	mittBus.off('clearCachePage');
+});
 </script>