소스 검색

reactor:省工单退回条件判断;

zhangchong 6 달 전
부모
커밋
9e0f8ceb4c
3개의 변경된 파일12개의 추가작업 그리고 12개의 파일을 삭제
  1. 6 0
      src/App.vue
  2. 0 6
      src/layout/component/main.vue
  3. 6 6
      src/views/business/order/index.vue

+ 6 - 0
src/App.vue

@@ -22,6 +22,7 @@ import setIntroduction from '@/utils/setIconfont';
 import { loginPageInfo } from '@/api/login';
 import { getImageUrl } from '@/utils/tools';
 import { useKeepALiveNames } from '@/stores/keepAliveNames';
+import { useFavicon,useDark } from '@vueuse/core';
 // 引入组件
 const LockScreen = defineAsyncComponent(() => import('@/layout/lockScreen/index.vue'));
 const SetTings = defineAsyncComponent(() => import('@/layout/navBars/breadcrumb/setings.vue'));
@@ -147,6 +148,11 @@ onMounted(() => {
 				event.preventDefault();
 				event.stopPropagation();
 			};
+			// 动态修改icon
+			const icon = useFavicon();
+			icon.value = themeConfig.value.faviconImage; // 更改当前左上角角标
+			const isDark = useDark();
+			isDark.value = themeConfig.value.isIsDark; // 更改暗黑模式
 			/*mittBus.on('*', (index, data) => {
         console.log(index, data);
       });*/

+ 0 - 6
src/layout/component/main.vue

@@ -19,7 +19,6 @@ import { useThemeConfig } from '@/stores/themeConfig';
 import { useUserInfo } from '@/stores/userInfo';
 import { NextLoading } from '@/utils/loading';
 import mittBus from '@/utils/mitt';
-import { useFavicon,useDark } from '@vueuse/core';
 
 // 引入组件
 const LayoutParentView = defineAsyncComponent(() => import('@/layout/routerView/parent.vue'));
@@ -70,11 +69,6 @@ onMounted(() => {
 	mittBus.on('scrollTopEmit', (res: any) => {
 		layoutMainScrollbarRef.value?.scrollTo(res.top ? res.top : 0, res.left ? res.left : 0)// 滚动到一组特定坐标(x,y)
 	});
-	// 动态修改icon
-	const icon = useFavicon();
-	icon.value = themeConfig.value.faviconImage; // 更改当前左上角角标
-	const isDark = useDark();
-	isDark.value = themeConfig.value.isIsDark; // 更改暗黑模式
 });
 // 暴露变量
 defineExpose({

+ 6 - 6
src/views/business/order/index.vue

@@ -88,7 +88,7 @@
 						<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 					</template>
 					<template #title="{ row }">
-						<order-detail :order="row" @updateList="queryList(true)">{{ row.title }}</order-detail>
+						<order-detail :order="row" @updateList="handleQuery">{{ row.title }}</order-detail>
 					</template>
 					<!-- 表格操作 -->
 					<template #operation="{ row }">
@@ -110,7 +110,7 @@
 								<el-button link type="success" @click="onOrderEdit(row)" title="编辑工单" v-if="row.canEdit" v-auth="'business:order:edit'">
 									修改
 								</el-button>-->
-						<order-detail :order="row" @updateList="queryList(true)" />
+						<order-detail :order="row" @updateList="handleQuery" />
 					</template>
 				</ProTable>
 			</template>
@@ -202,7 +202,7 @@
 						<span :class="'overdue-status-' + row.expiredStatus" :title="row.expiredStatusText"></span>
 					</template>
 					<template #title="{ row }">
-						<order-detail :order="row" @updateList="queryList(true)">{{ row.title }}</order-detail>
+						<order-detail :order="row" @updateList="handleQuery">{{ row.title }}</order-detail>
 					</template>
 					<template #operation="{ row }">
 						<!-- 省工单退回条件 是省工单(工单未归档且当前节点处于热线中心办理节点时)工单状态为办理中(归档之前) 9代表有退回申请 -->
@@ -220,7 +220,7 @@
 						>
 							退回</el-button
 						>
-						<order-detail :order="row" @updateList="queryList(true)" />
+						<order-detail :order="row" @updateList="handleQuery" />
 					</template>
 				</ProTable>
 				<div class="flex-end mt20" style="align-items: center">
@@ -238,9 +238,9 @@
 			</template>
 		</div>
 		<!-- 编辑重复性事件 -->
-		<repeat-event-edit ref="repeatEventEditRef" @updateList="queryList(true)" />
+		<repeat-event-edit ref="repeatEventEditRef" @updateList="handleQuery" />
 		<!-- 工单省退回 -->
-		<order-return ref="orderReturnRef" @updateList="queryList(true)" />
+		<order-return ref="orderReturnRef" @updateList="handleQuery" />
 		<!--	更多查询	-->
 		<el-drawer v-model="drawer" title="更多查询" size="500px">
 			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px">